diff --git a/.speakeasy/gen.lock b/.speakeasy/gen.lock
index 8695fb8..83eb5c2 100755
--- a/.speakeasy/gen.lock
+++ b/.speakeasy/gen.lock
@@ -1,23 +1,23 @@
 lockVersion: 2.0.0
 id: 1d22a5a4-8bac-42e3-b164-121fcacf66c9
 management:
-  docChecksum: 8a8b44e8346bd0bbfc9f9cf4d44c5332
+  docChecksum: f6e25376d224dc39635a7f5eed081de2
   docVersion: v1
-  speakeasyVersion: 1.355.0
-  generationVersion: 2.387.0
-  releaseVersion: 0.2.0-beta.2
-  configChecksum: 57f8a85077c5d6ca82c3da201d722346
+  speakeasyVersion: 1.363.1
+  generationVersion: 2.396.0
+  releaseVersion: 0.3.0-beta.2
+  configChecksum: 80434d26185e1d667e08dee8aa5c755a
   repoURL: https://github.com/clerk/clerk-sdk-java.git
   published: true
 features:
   java:
     additionalDependencies: 0.1.0
     constsAndDefaults: 0.1.1
-    core: 3.27.0
+    core: 3.28.1
     deprecations: 2.81.1
     examples: 2.81.3
     flattening: 2.81.1
-    globalSecurity: 2.82.6
+    globalSecurity: 2.82.7
     globalSecurityCallbacks: 0.1.0
     globalSecurityFlattening: 0.1.0
     globalServerURLs: 2.82.1
@@ -26,7 +26,7 @@ features:
     nullables: 0.1.0
     pagination: 0.2.2
     sdkHooks: 0.1.0
-    unions: 0.0.4
+    unions: 0.0.5
 generatedFiles:
   - src/main/java/com/clerk/backend_api/SecuritySource.java
   - src/main/java/com/clerk/backend_api/SDKConfiguration.java
diff --git a/.speakeasy/workflow.lock b/.speakeasy/workflow.lock
index 77d42e9..1200bf3 100644
--- a/.speakeasy/workflow.lock
+++ b/.speakeasy/workflow.lock
@@ -1,9 +1,9 @@
-speakeasyVersion: 1.355.0
+speakeasyVersion: 1.363.1
 sources:
     clerk-java-sdk:
         sourceNamespace: clerk-java-sdk
-        sourceRevisionDigest: sha256:7ac60d05f033a6b76be256a2f662720f9fe030f96984c4f42443865b8ba37128
-        sourceBlobDigest: sha256:169753eaf7b084082ad40ccdf4b11222d46b71259ed6c7eb809dbeb9089462c9
+        sourceRevisionDigest: sha256:a1d17471885280f9bc34dcc58e923357e6497e706b83ee918cdc2078413a95f4
+        sourceBlobDigest: sha256:709394a2b429d8bae8f4277a60d93a25c65c9a88cecd5f073ee1b576fd8129f1
         tags:
             - latest
             - main
@@ -11,8 +11,8 @@ targets:
     clerk-java:
         source: clerk-java-sdk
         sourceNamespace: clerk-java-sdk
-        sourceRevisionDigest: sha256:7ac60d05f033a6b76be256a2f662720f9fe030f96984c4f42443865b8ba37128
-        sourceBlobDigest: sha256:169753eaf7b084082ad40ccdf4b11222d46b71259ed6c7eb809dbeb9089462c9
+        sourceRevisionDigest: sha256:a1d17471885280f9bc34dcc58e923357e6497e706b83ee918cdc2078413a95f4
+        sourceBlobDigest: sha256:709394a2b429d8bae8f4277a60d93a25c65c9a88cecd5f073ee1b576fd8129f1
         outLocation: /github/workspace/repo
     my-first-target:
         source: clerk-java-sdk
diff --git a/README.md b/README.md
index 880e4de..e77987a 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ The samples below show how a published SDK artifact is used:
 
 Gradle:
 ```groovy
-implementation 'com.clerk:backend-api:0.2.0-beta.2'
+implementation 'com.clerk:backend-api:0.3.0-beta.2'
 ```
 
 Maven:
@@ -27,7 +27,7 @@ Maven:
 <dependency>
     <groupId>com.clerk</groupId>
     <artifactId>backend-api</artifactId>
-    <version>0.2.0-beta.2</version>
+    <version>0.3.0-beta.2</version>
 </dependency>
 ```
 
@@ -55,17 +55,7 @@ gradlew.bat publishToMavenLocal -Pskip.signing
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import java.lang.Exception;
 
 public class Application {
 
@@ -103,17 +93,11 @@ This example shows how to create an actor token that can be used to impersonate
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateActorTokenRequestBody;
+import com.clerk.backend_api.models.operations.CreateActorTokenResponse;
+import java.lang.Exception;
+import java.util.Map;
 
 public class Application {
 
@@ -125,8 +109,8 @@ public class Application {
 
             CreateActorTokenRequestBody req = CreateActorTokenRequestBody.builder()
                 .userId("<value>")
-                .actor(java.util.Map.ofEntries(
-                        entry("sub", "user_2OEpKhcCN1Lat9NQ0G6puh7q5Rb")))
+                .actor(Map.ofEntries(
+                        Map.entry("sub", "user_2OEpKhcCN1Lat9NQ0G6puh7q5Rb")))
                 .build();
 
             CreateActorTokenResponse res = sdk.actors().createToken()
@@ -139,7 +123,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -356,17 +340,7 @@ Here's an example of one such pagination call:
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import java.lang.Exception;
 
 public class Application {
 
@@ -413,17 +387,7 @@ Handling errors in this SDK should largely match your expectations.  All operati
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import java.lang.Exception;
 
 public class Application {
 
@@ -471,17 +435,9 @@ You can override the default server globally by passing a server index to the `s
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetPublicInterstitialResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -497,7 +453,7 @@ public class Application {
                 .call();
 
             // handle response
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -517,17 +473,9 @@ The default server can also be overridden globally by passing a URL to the `serv
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetPublicInterstitialResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -543,7 +491,7 @@ public class Application {
                 .call();
 
             // handle response
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -572,17 +520,9 @@ To authenticate with the API the `bearerAuth` parameter must be set when initial
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetPublicInterstitialResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -598,7 +538,7 @@ public class Application {
                 .call();
 
             // handle response
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
diff --git a/RELEASES.md b/RELEASES.md
index 013873b..55566e4 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -108,4 +108,14 @@ Based on:
 ### Generated
 - [java v0.2.0-beta.2] .
 ### Releases
-- [Maven Central v0.2.0-beta.2] https://central.sonatype.com/artifact/com.clerk/backend-api/0.2.0-beta.2 - .
\ No newline at end of file
+- [Maven Central v0.2.0-beta.2] https://central.sonatype.com/artifact/com.clerk/backend-api/0.2.0-beta.2 - .
+
+## 2024-08-13 15:19:32
+### Changes
+Based on:
+- OpenAPI Doc  
+- Speakeasy CLI 1.363.1 (2.396.0) https://github.com/speakeasy-api/speakeasy
+### Generated
+- [java v0.3.0-beta.2] .
+### Releases
+- [Maven Central v0.3.0-beta.2] https://central.sonatype.com/artifact/com.clerk/backend-api/0.3.0-beta.2 - .
\ No newline at end of file
diff --git a/USAGE.md b/USAGE.md
index 6a0e69c..ac5863c 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -3,17 +3,7 @@
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import java.lang.Exception;
 
 public class Application {
 
@@ -51,17 +41,11 @@ This example shows how to create an actor token that can be used to impersonate
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateActorTokenRequestBody;
+import com.clerk.backend_api.models.operations.CreateActorTokenResponse;
+import java.lang.Exception;
+import java.util.Map;
 
 public class Application {
 
@@ -73,8 +57,8 @@ public class Application {
 
             CreateActorTokenRequestBody req = CreateActorTokenRequestBody.builder()
                 .userId("<value>")
-                .actor(java.util.Map.ofEntries(
-                        entry("sub", "user_2OEpKhcCN1Lat9NQ0G6puh7q5Rb")))
+                .actor(Map.ofEntries(
+                        Map.entry("sub", "user_2OEpKhcCN1Lat9NQ0G6puh7q5Rb")))
                 .build();
 
             CreateActorTokenResponse res = sdk.actors().createToken()
@@ -87,7 +71,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
diff --git a/build.gradle b/build.gradle
index 42ec431..330898a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,7 +62,7 @@ tasks.withType(Javadoc) {
   options.addStringOption('Xdoclint:none', '-quiet')
 }
 group = "com.clerk"
-version = "0.2.0-beta.2"
+version = "0.3.0-beta.2"
 
 sourcesJar {
     archiveBaseName = "backend-api"
@@ -99,7 +99,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'com.clerk'
             artifactId = 'backend-api'
-            version = '0.2.0-beta.2'
+            version = '0.3.0-beta.2'
 
             from components.java
 
diff --git a/docs/models/components/ActorToken.md b/docs/models/components/ActorToken.md
index 9d8c016..6213a1c 100644
--- a/docs/models/components/ActorToken.md
+++ b/docs/models/components/ActorToken.md
@@ -3,14 +3,14 @@
 
 ## Fields
 
-| Field                                                                                                   | Type                                                                                                    | Required                                                                                                | Description                                                                                             |
-| ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                | [com.clerk.backend_api.models.components.ActorTokenObject](../../models/components/ActorTokenObject.md) | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
-| `id`                                                                                                    | *String*                                                                                                | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
-| `status`                                                                                                | [com.clerk.backend_api.models.components.ActorTokenStatus](../../models/components/ActorTokenStatus.md) | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
-| `userId`                                                                                                | *String*                                                                                                | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
-| `actor`                                                                                                 | [com.clerk.backend_api.models.components.ActorTokenActor](../../models/components/ActorTokenActor.md)   | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
-| `token`                                                                                                 | *JsonNullable<? extends String>*                                                                        | :heavy_minus_sign:                                                                                      | N/A                                                                                                     |
-| `url`                                                                                                   | *JsonNullable<? extends String>*                                                                        | :heavy_minus_sign:                                                                                      | N/A                                                                                                     |
-| `createdAt`                                                                                             | *long*                                                                                                  | :heavy_check_mark:                                                                                      | Unix timestamp of creation.<br/>                                                                        |
-| `updatedAt`                                                                                             | *long*                                                                                                  | :heavy_check_mark:                                                                                      | Unix timestamp of last update.<br/>                                                                     |
\ No newline at end of file
+| Field                                                           | Type                                                            | Required                                                        | Description                                                     |
+| --------------------------------------------------------------- | --------------------------------------------------------------- | --------------------------------------------------------------- | --------------------------------------------------------------- |
+| `object`                                                        | [ActorTokenObject](../../models/components/ActorTokenObject.md) | :heavy_check_mark:                                              | N/A                                                             |
+| `id`                                                            | *String*                                                        | :heavy_check_mark:                                              | N/A                                                             |
+| `status`                                                        | [ActorTokenStatus](../../models/components/ActorTokenStatus.md) | :heavy_check_mark:                                              | N/A                                                             |
+| `userId`                                                        | *String*                                                        | :heavy_check_mark:                                              | N/A                                                             |
+| `actor`                                                         | [ActorTokenActor](../../models/components/ActorTokenActor.md)   | :heavy_check_mark:                                              | N/A                                                             |
+| `token`                                                         | *JsonNullable<String>*                                          | :heavy_minus_sign:                                              | N/A                                                             |
+| `url`                                                           | *JsonNullable<String>*                                          | :heavy_minus_sign:                                              | N/A                                                             |
+| `createdAt`                                                     | *long*                                                          | :heavy_check_mark:                                              | Unix timestamp of creation.<br/>                                |
+| `updatedAt`                                                     | *long*                                                          | :heavy_check_mark:                                              | Unix timestamp of last update.<br/>                             |
\ No newline at end of file
diff --git a/docs/models/components/Admin.md b/docs/models/components/Admin.md
index e1090a4..d60f1f5 100644
--- a/docs/models/components/Admin.md
+++ b/docs/models/components/Admin.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                 | Type                                                                                                                  | Required                                                                                                              | Description                                                                                                           |
-| --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- |
-| `status`                                                                                                              | [com.clerk.backend_api.models.components.AdminVerificationStatus](../../models/components/AdminVerificationStatus.md) | :heavy_check_mark:                                                                                                    | N/A                                                                                                                   |
-| `strategy`                                                                                                            | [com.clerk.backend_api.models.components.VerificationStrategy](../../models/components/VerificationStrategy.md)       | :heavy_check_mark:                                                                                                    | N/A                                                                                                                   |
-| `attempts`                                                                                                            | *JsonNullable<? extends Long>*                                                                                        | :heavy_minus_sign:                                                                                                    | N/A                                                                                                                   |
-| `expireAt`                                                                                                            | *JsonNullable<? extends Long>*                                                                                        | :heavy_minus_sign:                                                                                                    | N/A                                                                                                                   |
\ No newline at end of file
+| Field                                                                         | Type                                                                          | Required                                                                      | Description                                                                   |
+| ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- |
+| `status`                                                                      | [AdminVerificationStatus](../../models/components/AdminVerificationStatus.md) | :heavy_check_mark:                                                            | N/A                                                                           |
+| `strategy`                                                                    | [VerificationStrategy](../../models/components/VerificationStrategy.md)       | :heavy_check_mark:                                                            | N/A                                                                           |
+| `attempts`                                                                    | *JsonNullable<Long>*                                                          | :heavy_minus_sign:                                                            | N/A                                                                           |
+| `expireAt`                                                                    | *JsonNullable<Long>*                                                          | :heavy_minus_sign:                                                            | N/A                                                                           |
\ No newline at end of file
diff --git a/docs/models/components/AllowlistIdentifier.md b/docs/models/components/AllowlistIdentifier.md
index a0ffefd..2be845e 100644
--- a/docs/models/components/AllowlistIdentifier.md
+++ b/docs/models/components/AllowlistIdentifier.md
@@ -3,13 +3,13 @@
 
 ## Fields
 
-| Field                                                                                                                                         | Type                                                                                                                                          | Required                                                                                                                                      | Description                                                                                                                                   |
-| --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                                                      | [Optional<? extends com.clerk.backend_api.models.components.AllowlistIdentifierObject>](../../models/components/AllowlistIdentifierObject.md) | :heavy_minus_sign:                                                                                                                            | String representing the object's type. Objects of the same type share the same value.<br/>                                                    |
-| `id`                                                                                                                                          | *Optional<? extends String>*                                                                                                                  | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
-| `invitationId`                                                                                                                                | *Optional<? extends String>*                                                                                                                  | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
-| `identifier`                                                                                                                                  | *Optional<? extends String>*                                                                                                                  | :heavy_minus_sign:                                                                                                                            | An email address or a phone number.<br/>                                                                                                      |
-| `identifierType`                                                                                                                              | [Optional<? extends com.clerk.backend_api.models.components.IdentifierType>](../../models/components/IdentifierType.md)                       | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
-| `instanceId`                                                                                                                                  | *Optional<? extends String>*                                                                                                                  | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
-| `createdAt`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                    | :heavy_minus_sign:                                                                                                                            | Unix timestamp of creation<br/>                                                                                                               |
-| `updatedAt`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                    | :heavy_minus_sign:                                                                                                                            | Unix timestamp of last update.<br/>                                                                                                           |
\ No newline at end of file
+| Field                                                                                       | Type                                                                                        | Required                                                                                    | Description                                                                                 |
+| ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
+| `object`                                                                                    | [Optional<AllowlistIdentifierObject>](../../models/components/AllowlistIdentifierObject.md) | :heavy_minus_sign:                                                                          | String representing the object's type. Objects of the same type share the same value.<br/>  |
+| `id`                                                                                        | *Optional<String>*                                                                          | :heavy_minus_sign:                                                                          | N/A                                                                                         |
+| `invitationId`                                                                              | *Optional<String>*                                                                          | :heavy_minus_sign:                                                                          | N/A                                                                                         |
+| `identifier`                                                                                | *Optional<String>*                                                                          | :heavy_minus_sign:                                                                          | An email address or a phone number.<br/>                                                    |
+| `identifierType`                                                                            | [Optional<IdentifierType>](../../models/components/IdentifierType.md)                       | :heavy_minus_sign:                                                                          | N/A                                                                                         |
+| `instanceId`                                                                                | *Optional<String>*                                                                          | :heavy_minus_sign:                                                                          | N/A                                                                                         |
+| `createdAt`                                                                                 | *Optional<Long>*                                                                            | :heavy_minus_sign:                                                                          | Unix timestamp of creation<br/>                                                             |
+| `updatedAt`                                                                                 | *Optional<Long>*                                                                            | :heavy_minus_sign:                                                                          | Unix timestamp of last update.<br/>                                                         |
\ No newline at end of file
diff --git a/docs/models/components/AttributeMapping.md b/docs/models/components/AttributeMapping.md
index 3ff71d3..de4f9d5 100644
--- a/docs/models/components/AttributeMapping.md
+++ b/docs/models/components/AttributeMapping.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                        | Type                         | Required                     | Description                  |
-| ---------------------------- | ---------------------------- | ---------------------------- | ---------------------------- |
-| `userId`                     | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
-| `emailAddress`               | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
-| `firstName`                  | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
-| `lastName`                   | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
\ No newline at end of file
+| Field              | Type               | Required           | Description        |
+| ------------------ | ------------------ | ------------------ | ------------------ |
+| `userId`           | *Optional<String>* | :heavy_minus_sign: | N/A                |
+| `emailAddress`     | *Optional<String>* | :heavy_minus_sign: | N/A                |
+| `firstName`        | *Optional<String>* | :heavy_minus_sign: | N/A                |
+| `lastName`         | *Optional<String>* | :heavy_minus_sign: | N/A                |
\ No newline at end of file
diff --git a/docs/models/components/BlocklistIdentifier.md b/docs/models/components/BlocklistIdentifier.md
index c71f4c0..0cb7744 100644
--- a/docs/models/components/BlocklistIdentifier.md
+++ b/docs/models/components/BlocklistIdentifier.md
@@ -3,12 +3,12 @@
 
 ## Fields
 
-| Field                                                                                                                                                         | Type                                                                                                                                                          | Required                                                                                                                                                      | Description                                                                                                                                                   |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                                                                      | [Optional<? extends com.clerk.backend_api.models.components.BlocklistIdentifierObject>](../../models/components/BlocklistIdentifierObject.md)                 | :heavy_minus_sign:                                                                                                                                            | String representing the object's type. Objects of the same type share the same value.<br/>                                                                    |
-| `id`                                                                                                                                                          | *Optional<? extends String>*                                                                                                                                  | :heavy_minus_sign:                                                                                                                                            | N/A                                                                                                                                                           |
-| `identifier`                                                                                                                                                  | *Optional<? extends String>*                                                                                                                                  | :heavy_minus_sign:                                                                                                                                            | An email address, email domain, phone number or web3 wallet.<br/>                                                                                             |
-| `identifierType`                                                                                                                                              | [Optional<? extends com.clerk.backend_api.models.components.BlocklistIdentifierIdentifierType>](../../models/components/BlocklistIdentifierIdentifierType.md) | :heavy_minus_sign:                                                                                                                                            | N/A                                                                                                                                                           |
-| `instanceId`                                                                                                                                                  | *Optional<? extends String>*                                                                                                                                  | :heavy_minus_sign:                                                                                                                                            | N/A                                                                                                                                                           |
-| `createdAt`                                                                                                                                                   | *Optional<? extends Long>*                                                                                                                                    | :heavy_minus_sign:                                                                                                                                            | Unix timestamp of creation<br/>                                                                                                                               |
-| `updatedAt`                                                                                                                                                   | *Optional<? extends Long>*                                                                                                                                    | :heavy_minus_sign:                                                                                                                                            | Unix timestamp of last update.<br/>                                                                                                                           |
\ No newline at end of file
+| Field                                                                                                       | Type                                                                                                        | Required                                                                                                    | Description                                                                                                 |
+| ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
+| `object`                                                                                                    | [Optional<BlocklistIdentifierObject>](../../models/components/BlocklistIdentifierObject.md)                 | :heavy_minus_sign:                                                                                          | String representing the object's type. Objects of the same type share the same value.<br/>                  |
+| `id`                                                                                                        | *Optional<String>*                                                                                          | :heavy_minus_sign:                                                                                          | N/A                                                                                                         |
+| `identifier`                                                                                                | *Optional<String>*                                                                                          | :heavy_minus_sign:                                                                                          | An email address, email domain, phone number or web3 wallet.<br/>                                           |
+| `identifierType`                                                                                            | [Optional<BlocklistIdentifierIdentifierType>](../../models/components/BlocklistIdentifierIdentifierType.md) | :heavy_minus_sign:                                                                                          | N/A                                                                                                         |
+| `instanceId`                                                                                                | *Optional<String>*                                                                                          | :heavy_minus_sign:                                                                                          | N/A                                                                                                         |
+| `createdAt`                                                                                                 | *Optional<Long>*                                                                                            | :heavy_minus_sign:                                                                                          | Unix timestamp of creation<br/>                                                                             |
+| `updatedAt`                                                                                                 | *Optional<Long>*                                                                                            | :heavy_minus_sign:                                                                                          | Unix timestamp of last update.<br/>                                                                         |
\ No newline at end of file
diff --git a/docs/models/components/BlocklistIdentifiers.md b/docs/models/components/BlocklistIdentifiers.md
index 72a8a51..adcfeae 100644
--- a/docs/models/components/BlocklistIdentifiers.md
+++ b/docs/models/components/BlocklistIdentifiers.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                               | Type                                                                                                                | Required                                                                                                            | Description                                                                                                         |
-| ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
-| `data`                                                                                                              | List<[com.clerk.backend_api.models.components.BlocklistIdentifier](../../models/components/BlocklistIdentifier.md)> | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `totalCount`                                                                                                        | *long*                                                                                                              | :heavy_check_mark:                                                                                                  | Total number of blocklist identifiers<br/>                                                                          |
\ No newline at end of file
+| Field                                                                       | Type                                                                        | Required                                                                    | Description                                                                 |
+| --------------------------------------------------------------------------- | --------------------------------------------------------------------------- | --------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
+| `data`                                                                      | List<[BlocklistIdentifier](../../models/components/BlocklistIdentifier.md)> | :heavy_check_mark:                                                          | N/A                                                                         |
+| `totalCount`                                                                | *long*                                                                      | :heavy_check_mark:                                                          | Total number of blocklist identifiers<br/>                                  |
\ No newline at end of file
diff --git a/docs/models/components/ClerkError.md b/docs/models/components/ClerkError.md
index 00552ed..793ed1a 100644
--- a/docs/models/components/ClerkError.md
+++ b/docs/models/components/ClerkError.md
@@ -3,10 +3,10 @@
 
 ## Fields
 
-| Field                                                                                               | Type                                                                                                | Required                                                                                            | Description                                                                                         |
-| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
-| `message`                                                                                           | *String*                                                                                            | :heavy_check_mark:                                                                                  | N/A                                                                                                 |
-| `longMessage`                                                                                       | *String*                                                                                            | :heavy_check_mark:                                                                                  | N/A                                                                                                 |
-| `code`                                                                                              | *String*                                                                                            | :heavy_check_mark:                                                                                  | N/A                                                                                                 |
-| `meta`                                                                                              | [Optional<? extends com.clerk.backend_api.models.components.Meta>](../../models/components/Meta.md) | :heavy_minus_sign:                                                                                  | N/A                                                                                                 |
-| `clerkTraceId`                                                                                      | *Optional<? extends String>*                                                                        | :heavy_minus_sign:                                                                                  | N/A                                                                                                 |
\ No newline at end of file
+| Field                                             | Type                                              | Required                                          | Description                                       |
+| ------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- |
+| `message`                                         | *String*                                          | :heavy_check_mark:                                | N/A                                               |
+| `longMessage`                                     | *String*                                          | :heavy_check_mark:                                | N/A                                               |
+| `code`                                            | *String*                                          | :heavy_check_mark:                                | N/A                                               |
+| `meta`                                            | [Optional<Meta>](../../models/components/Meta.md) | :heavy_minus_sign:                                | N/A                                               |
+| `clerkTraceId`                                    | *Optional<String>*                                | :heavy_minus_sign:                                | N/A                                               |
\ No newline at end of file
diff --git a/docs/models/components/Client.md b/docs/models/components/Client.md
index 306c40f..9b9cda7 100644
--- a/docs/models/components/Client.md
+++ b/docs/models/components/Client.md
@@ -3,14 +3,14 @@
 
 ## Fields
 
-| Field                                                                                       | Type                                                                                        | Required                                                                                    | Description                                                                                 |
-| ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
-| `object`                                                                                    | [com.clerk.backend_api.models.components.Object](../../models/components/Object.md)         | :heavy_check_mark:                                                                          | String representing the object's type. Objects of the same type share the same value.<br/>  |
-| `id`                                                                                        | *String*                                                                                    | :heavy_check_mark:                                                                          | String representing the identifier of the session.<br/>                                     |
-| `sessionIds`                                                                                | List<*String*>                                                                              | :heavy_check_mark:                                                                          | N/A                                                                                         |
-| `sessions`                                                                                  | List<[com.clerk.backend_api.models.components.Session](../../models/components/Session.md)> | :heavy_check_mark:                                                                          | N/A                                                                                         |
-| `signInId`                                                                                  | *Optional<? extends String>*                                                                | :heavy_check_mark:                                                                          | N/A                                                                                         |
-| `signUpId`                                                                                  | *Optional<? extends String>*                                                                | :heavy_check_mark:                                                                          | N/A                                                                                         |
-| `lastActiveSessionId`                                                                       | *Optional<? extends String>*                                                                | :heavy_check_mark:                                                                          | Last active session_id.<br/>                                                                |
-| `updatedAt`                                                                                 | *long*                                                                                      | :heavy_check_mark:                                                                          | Unix timestamp of last update.<br/>                                                         |
-| `createdAt`                                                                                 | *long*                                                                                      | :heavy_check_mark:                                                                          | Unix timestamp of creation.<br/>                                                            |
\ No newline at end of file
+| Field                                                                                  | Type                                                                                   | Required                                                                               | Description                                                                            |
+| -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- |
+| `object`                                                                               | [Object](../../models/components/Object.md)                                            | :heavy_check_mark:                                                                     | String representing the object's type. Objects of the same type share the same value.<br/> |
+| `id`                                                                                   | *String*                                                                               | :heavy_check_mark:                                                                     | String representing the identifier of the session.<br/>                                |
+| `sessionIds`                                                                           | List<*String*>                                                                         | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `sessions`                                                                             | List<[Session](../../models/components/Session.md)>                                    | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `signInId`                                                                             | *Optional<String>*                                                                     | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `signUpId`                                                                             | *Optional<String>*                                                                     | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `lastActiveSessionId`                                                                  | *Optional<String>*                                                                     | :heavy_check_mark:                                                                     | Last active session_id.<br/>                                                           |
+| `updatedAt`                                                                            | *long*                                                                                 | :heavy_check_mark:                                                                     | Unix timestamp of last update.<br/>                                                    |
+| `createdAt`                                                                            | *long*                                                                                 | :heavy_check_mark:                                                                     | Unix timestamp of creation.<br/>                                                       |
\ No newline at end of file
diff --git a/docs/models/components/DeletedObject.md b/docs/models/components/DeletedObject.md
index 4465bfe..8985dcb 100644
--- a/docs/models/components/DeletedObject.md
+++ b/docs/models/components/DeletedObject.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                        | Type                         | Required                     | Description                  |
-| ---------------------------- | ---------------------------- | ---------------------------- | ---------------------------- |
-| `object`                     | *String*                     | :heavy_check_mark:           | N/A                          |
-| `id`                         | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
-| `slug`                       | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
-| `deleted`                    | *boolean*                    | :heavy_check_mark:           | N/A                          |
\ No newline at end of file
+| Field              | Type               | Required           | Description        |
+| ------------------ | ------------------ | ------------------ | ------------------ |
+| `object`           | *String*           | :heavy_check_mark: | N/A                |
+| `id`               | *Optional<String>* | :heavy_minus_sign: | N/A                |
+| `slug`             | *Optional<String>* | :heavy_minus_sign: | N/A                |
+| `deleted`          | *boolean*          | :heavy_check_mark: | N/A                |
\ No newline at end of file
diff --git a/docs/models/components/Domain.md b/docs/models/components/Domain.md
index 4026ce7..9aa5692 100644
--- a/docs/models/components/Domain.md
+++ b/docs/models/components/Domain.md
@@ -3,14 +3,14 @@
 
 ## Fields
 
-| Field                                                                                               | Type                                                                                                | Required                                                                                            | Description                                                                                         |
-| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
-| `object`                                                                                            | [com.clerk.backend_api.models.components.DomainObject](../../models/components/DomainObject.md)     | :heavy_check_mark:                                                                                  | N/A                                                                                                 |
-| `id`                                                                                                | *String*                                                                                            | :heavy_check_mark:                                                                                  | N/A                                                                                                 |
-| `name`                                                                                              | *String*                                                                                            | :heavy_check_mark:                                                                                  | N/A                                                                                                 |
-| `isSatellite`                                                                                       | *boolean*                                                                                           | :heavy_check_mark:                                                                                  | N/A                                                                                                 |
-| `frontendApiUrl`                                                                                    | *String*                                                                                            | :heavy_check_mark:                                                                                  | N/A                                                                                                 |
-| `accountsPortalUrl`                                                                                 | *JsonNullable<? extends String>*                                                                    | :heavy_minus_sign:                                                                                  | Null for satellite domains.<br/>                                                                    |
-| `proxyUrl`                                                                                          | *JsonNullable<? extends String>*                                                                    | :heavy_minus_sign:                                                                                  | N/A                                                                                                 |
-| `developmentOrigin`                                                                                 | *String*                                                                                            | :heavy_check_mark:                                                                                  | N/A                                                                                                 |
-| `cnameTargets`                                                                                      | List<[com.clerk.backend_api.models.components.CNameTarget](../../models/components/CNameTarget.md)> | :heavy_minus_sign:                                                                                  | N/A                                                                                                 |
\ No newline at end of file
+| Field                                                       | Type                                                        | Required                                                    | Description                                                 |
+| ----------------------------------------------------------- | ----------------------------------------------------------- | ----------------------------------------------------------- | ----------------------------------------------------------- |
+| `object`                                                    | [DomainObject](../../models/components/DomainObject.md)     | :heavy_check_mark:                                          | N/A                                                         |
+| `id`                                                        | *String*                                                    | :heavy_check_mark:                                          | N/A                                                         |
+| `name`                                                      | *String*                                                    | :heavy_check_mark:                                          | N/A                                                         |
+| `isSatellite`                                               | *boolean*                                                   | :heavy_check_mark:                                          | N/A                                                         |
+| `frontendApiUrl`                                            | *String*                                                    | :heavy_check_mark:                                          | N/A                                                         |
+| `accountsPortalUrl`                                         | *JsonNullable<String>*                                      | :heavy_minus_sign:                                          | Null for satellite domains.<br/>                            |
+| `proxyUrl`                                                  | *JsonNullable<String>*                                      | :heavy_minus_sign:                                          | N/A                                                         |
+| `developmentOrigin`                                         | *String*                                                    | :heavy_check_mark:                                          | N/A                                                         |
+| `cnameTargets`                                              | List<[CNameTarget](../../models/components/CNameTarget.md)> | :heavy_minus_sign:                                          | N/A                                                         |
\ No newline at end of file
diff --git a/docs/models/components/Domains.md b/docs/models/components/Domains.md
index a6ff079..712fc28 100644
--- a/docs/models/components/Domains.md
+++ b/docs/models/components/Domains.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                     | Type                                                                                      | Required                                                                                  | Description                                                                               |
-| ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- |
-| `data`                                                                                    | List<[com.clerk.backend_api.models.components.Domain](../../models/components/Domain.md)> | :heavy_check_mark:                                                                        | N/A                                                                                       |
-| `totalCount`                                                                              | *long*                                                                                    | :heavy_check_mark:                                                                        | Total number of domains<br/>                                                              |
\ No newline at end of file
+| Field                                             | Type                                              | Required                                          | Description                                       |
+| ------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- |
+| `data`                                            | List<[Domain](../../models/components/Domain.md)> | :heavy_check_mark:                                | N/A                                               |
+| `totalCount`                                      | *long*                                            | :heavy_check_mark:                                | Total number of domains<br/>                      |
\ No newline at end of file
diff --git a/docs/models/components/EmailAddress.md b/docs/models/components/EmailAddress.md
index 851517e..9594578 100644
--- a/docs/models/components/EmailAddress.md
+++ b/docs/models/components/EmailAddress.md
@@ -3,13 +3,13 @@
 
 ## Fields
 
-| Field                                                                                                               | Type                                                                                                                | Required                                                                                                            | Description                                                                                                         |
-| ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
-| `id`                                                                                                                | *Optional<? extends String>*                                                                                        | :heavy_minus_sign:                                                                                                  | N/A                                                                                                                 |
-| `object`                                                                                                            | [com.clerk.backend_api.models.components.EmailAddressObject](../../models/components/EmailAddressObject.md)         | :heavy_check_mark:                                                                                                  | String representing the object's type. Objects of the same type share the same value.<br/>                          |
-| `emailAddress`                                                                                                      | *String*                                                                                                            | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `reserved`                                                                                                          | *boolean*                                                                                                           | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `verification`                                                                                                      | [Optional<? extends com.clerk.backend_api.models.components.Verification>](../../models/components/Verification.md) | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `linkedTo`                                                                                                          | List<[com.clerk.backend_api.models.components.IdentificationLink](../../models/components/IdentificationLink.md)>   | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `createdAt`                                                                                                         | *long*                                                                                                              | :heavy_check_mark:                                                                                                  | Unix timestamp of creation<br/>                                                                                     |
-| `updatedAt`                                                                                                         | *long*                                                                                                              | :heavy_check_mark:                                                                                                  | Unix timestamp of creation<br/>                                                                                     |
\ No newline at end of file
+| Field                                                                                  | Type                                                                                   | Required                                                                               | Description                                                                            |
+| -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- |
+| `id`                                                                                   | *Optional<String>*                                                                     | :heavy_minus_sign:                                                                     | N/A                                                                                    |
+| `object`                                                                               | [EmailAddressObject](../../models/components/EmailAddressObject.md)                    | :heavy_check_mark:                                                                     | String representing the object's type. Objects of the same type share the same value.<br/> |
+| `emailAddress`                                                                         | *String*                                                                               | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `reserved`                                                                             | *boolean*                                                                              | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `verification`                                                                         | [Optional<Verification>](../../models/components/Verification.md)                      | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `linkedTo`                                                                             | List<[IdentificationLink](../../models/components/IdentificationLink.md)>              | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `createdAt`                                                                            | *long*                                                                                 | :heavy_check_mark:                                                                     | Unix timestamp of creation<br/>                                                        |
+| `updatedAt`                                                                            | *long*                                                                                 | :heavy_check_mark:                                                                     | Unix timestamp of creation<br/>                                                        |
\ No newline at end of file
diff --git a/docs/models/components/ErrorClerkError.md b/docs/models/components/ErrorClerkError.md
index 19af3aa..73da77a 100644
--- a/docs/models/components/ErrorClerkError.md
+++ b/docs/models/components/ErrorClerkError.md
@@ -3,10 +3,10 @@
 
 ## Fields
 
-| Field                                                                                                         | Type                                                                                                          | Required                                                                                                      | Description                                                                                                   |
-| ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
-| `message`                                                                                                     | *String*                                                                                                      | :heavy_check_mark:                                                                                            | N/A                                                                                                           |
-| `longMessage`                                                                                                 | *String*                                                                                                      | :heavy_check_mark:                                                                                            | N/A                                                                                                           |
-| `code`                                                                                                        | *String*                                                                                                      | :heavy_check_mark:                                                                                            | N/A                                                                                                           |
-| `meta`                                                                                                        | [Optional<? extends com.clerk.backend_api.models.components.ErrorMeta>](../../models/components/ErrorMeta.md) | :heavy_minus_sign:                                                                                            | N/A                                                                                                           |
-| `clerkTraceId`                                                                                                | *Optional<? extends String>*                                                                                  | :heavy_minus_sign:                                                                                            | N/A                                                                                                           |
\ No newline at end of file
+| Field                                                       | Type                                                        | Required                                                    | Description                                                 |
+| ----------------------------------------------------------- | ----------------------------------------------------------- | ----------------------------------------------------------- | ----------------------------------------------------------- |
+| `message`                                                   | *String*                                                    | :heavy_check_mark:                                          | N/A                                                         |
+| `longMessage`                                               | *String*                                                    | :heavy_check_mark:                                          | N/A                                                         |
+| `code`                                                      | *String*                                                    | :heavy_check_mark:                                          | N/A                                                         |
+| `meta`                                                      | [Optional<ErrorMeta>](../../models/components/ErrorMeta.md) | :heavy_minus_sign:                                          | N/A                                                         |
+| `clerkTraceId`                                              | *Optional<String>*                                          | :heavy_minus_sign:                                          | N/A                                                         |
\ No newline at end of file
diff --git a/docs/models/components/IdentificationLink.md b/docs/models/components/IdentificationLink.md
index b19c2cb..5f6b4ef 100644
--- a/docs/models/components/IdentificationLink.md
+++ b/docs/models/components/IdentificationLink.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                           | Type                                                                            | Required                                                                        | Description                                                                     |
-| ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- |
-| `type`                                                                          | [com.clerk.backend_api.models.components.Type](../../models/components/Type.md) | :heavy_check_mark:                                                              | N/A                                                                             |
-| `id`                                                                            | *String*                                                                        | :heavy_check_mark:                                                              | N/A                                                                             |
\ No newline at end of file
+| Field                                   | Type                                    | Required                                | Description                             |
+| --------------------------------------- | --------------------------------------- | --------------------------------------- | --------------------------------------- |
+| `type`                                  | [Type](../../models/components/Type.md) | :heavy_check_mark:                      | N/A                                     |
+| `id`                                    | *String*                                | :heavy_check_mark:                      | N/A                                     |
\ No newline at end of file
diff --git a/docs/models/components/InstanceRestrictions.md b/docs/models/components/InstanceRestrictions.md
index da67f5a..808fbf0 100644
--- a/docs/models/components/InstanceRestrictions.md
+++ b/docs/models/components/InstanceRestrictions.md
@@ -3,10 +3,10 @@
 
 ## Fields
 
-| Field                                                                                                                                           | Type                                                                                                                                            | Required                                                                                                                                        | Description                                                                                                                                     |
-| ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.components.InstanceRestrictionsObject>](../../models/components/InstanceRestrictionsObject.md) | :heavy_minus_sign:                                                                                                                              | String representing the object's type. Objects of the same type share the same value.                                                           |
-| `allowlist`                                                                                                                                     | *Optional<? extends Boolean>*                                                                                                                   | :heavy_minus_sign:                                                                                                                              | N/A                                                                                                                                             |
-| `blocklist`                                                                                                                                     | *Optional<? extends Boolean>*                                                                                                                   | :heavy_minus_sign:                                                                                                                              | N/A                                                                                                                                             |
-| `blockEmailSubaddresses`                                                                                                                        | *Optional<? extends Boolean>*                                                                                                                   | :heavy_minus_sign:                                                                                                                              | N/A                                                                                                                                             |
-| `ignoreDotsForGmailAddresses`                                                                                                                   | *Optional<? extends Boolean>*                                                                                                                   | :heavy_minus_sign:                                                                                                                              | N/A                                                                                                                                             |
\ No newline at end of file
+| Field                                                                                         | Type                                                                                          | Required                                                                                      | Description                                                                                   |
+| --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- |
+| `object`                                                                                      | [Optional<InstanceRestrictionsObject>](../../models/components/InstanceRestrictionsObject.md) | :heavy_minus_sign:                                                                            | String representing the object's type. Objects of the same type share the same value.         |
+| `allowlist`                                                                                   | *Optional<Boolean>*                                                                           | :heavy_minus_sign:                                                                            | N/A                                                                                           |
+| `blocklist`                                                                                   | *Optional<Boolean>*                                                                           | :heavy_minus_sign:                                                                            | N/A                                                                                           |
+| `blockEmailSubaddresses`                                                                      | *Optional<Boolean>*                                                                           | :heavy_minus_sign:                                                                            | N/A                                                                                           |
+| `ignoreDotsForGmailAddresses`                                                                 | *Optional<Boolean>*                                                                           | :heavy_minus_sign:                                                                            | N/A                                                                                           |
\ No newline at end of file
diff --git a/docs/models/components/InstanceSettings.md b/docs/models/components/InstanceSettings.md
index 3d457bf..660a8df 100644
--- a/docs/models/components/InstanceSettings.md
+++ b/docs/models/components/InstanceSettings.md
@@ -3,11 +3,11 @@
 
 ## Fields
 
-| Field                                                                                                                                   | Type                                                                                                                                    | Required                                                                                                                                | Description                                                                                                                             |
-| --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.InstanceSettingsObject>](../../models/components/InstanceSettingsObject.md) | :heavy_minus_sign:                                                                                                                      | String representing the object's type. Objects of the same type share the same value.                                                   |
-| `id`                                                                                                                                    | *Optional<? extends String>*                                                                                                            | :heavy_minus_sign:                                                                                                                      | N/A                                                                                                                                     |
-| `restrictedToAllowlist`                                                                                                                 | *Optional<? extends Boolean>*                                                                                                           | :heavy_minus_sign:                                                                                                                      | N/A                                                                                                                                     |
-| `fromEmailAddress`                                                                                                                      | *Optional<? extends String>*                                                                                                            | :heavy_minus_sign:                                                                                                                      | N/A                                                                                                                                     |
-| `progressiveSignUp`                                                                                                                     | *Optional<? extends Boolean>*                                                                                                           | :heavy_minus_sign:                                                                                                                      | N/A                                                                                                                                     |
-| `enhancedEmailDeliverability`                                                                                                           | *Optional<? extends Boolean>*                                                                                                           | :heavy_minus_sign:                                                                                                                      | N/A                                                                                                                                     |
\ No newline at end of file
+| Field                                                                                 | Type                                                                                  | Required                                                                              | Description                                                                           |
+| ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
+| `object`                                                                              | [Optional<InstanceSettingsObject>](../../models/components/InstanceSettingsObject.md) | :heavy_minus_sign:                                                                    | String representing the object's type. Objects of the same type share the same value. |
+| `id`                                                                                  | *Optional<String>*                                                                    | :heavy_minus_sign:                                                                    | N/A                                                                                   |
+| `restrictedToAllowlist`                                                               | *Optional<Boolean>*                                                                   | :heavy_minus_sign:                                                                    | N/A                                                                                   |
+| `fromEmailAddress`                                                                    | *Optional<String>*                                                                    | :heavy_minus_sign:                                                                    | N/A                                                                                   |
+| `progressiveSignUp`                                                                   | *Optional<Boolean>*                                                                   | :heavy_minus_sign:                                                                    | N/A                                                                                   |
+| `enhancedEmailDeliverability`                                                         | *Optional<Boolean>*                                                                   | :heavy_minus_sign:                                                                    | N/A                                                                                   |
\ No newline at end of file
diff --git a/docs/models/components/Invitation.md b/docs/models/components/Invitation.md
index 49cd69c..031e4ff 100644
--- a/docs/models/components/Invitation.md
+++ b/docs/models/components/Invitation.md
@@ -3,14 +3,14 @@
 
 ## Fields
 
-| Field                                                                                                                                       | Type                                                                                                                                        | Required                                                                                                                                    | Description                                                                                                                                 | Example                                                                                                                                     |
-| ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                                                    | [com.clerk.backend_api.models.components.InvitationObject](../../models/components/InvitationObject.md)                                     | :heavy_check_mark:                                                                                                                          | N/A                                                                                                                                         |                                                                                                                                             |
-| `id`                                                                                                                                        | *String*                                                                                                                                    | :heavy_check_mark:                                                                                                                          | N/A                                                                                                                                         |                                                                                                                                             |
-| `emailAddress`                                                                                                                              | *String*                                                                                                                                    | :heavy_check_mark:                                                                                                                          | N/A                                                                                                                                         |                                                                                                                                             |
-| `publicMetadata`                                                                                                                            | [Optional<? extends com.clerk.backend_api.models.components.InvitationPublicMetadata>](../../models/components/InvitationPublicMetadata.md) | :heavy_minus_sign:                                                                                                                          | N/A                                                                                                                                         |                                                                                                                                             |
-| `revoked`                                                                                                                                   | *Optional<? extends Boolean>*                                                                                                               | :heavy_minus_sign:                                                                                                                          | N/A                                                                                                                                         | false                                                                                                                                       |
-| `status`                                                                                                                                    | [com.clerk.backend_api.models.components.InvitationStatus](../../models/components/InvitationStatus.md)                                     | :heavy_check_mark:                                                                                                                          | N/A                                                                                                                                         | pending                                                                                                                                     |
-| `url`                                                                                                                                       | *JsonNullable<? extends String>*                                                                                                            | :heavy_minus_sign:                                                                                                                          | N/A                                                                                                                                         |                                                                                                                                             |
-| `createdAt`                                                                                                                                 | *long*                                                                                                                                      | :heavy_check_mark:                                                                                                                          | Unix timestamp of creation.<br/>                                                                                                            |                                                                                                                                             |
-| `updatedAt`                                                                                                                                 | *long*                                                                                                                                      | :heavy_check_mark:                                                                                                                          | Unix timestamp of last update.<br/>                                                                                                         |                                                                                                                                             |
\ No newline at end of file
+| Field                                                                                     | Type                                                                                      | Required                                                                                  | Description                                                                               | Example                                                                                   |
+| ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- |
+| `object`                                                                                  | [InvitationObject](../../models/components/InvitationObject.md)                           | :heavy_check_mark:                                                                        | N/A                                                                                       |                                                                                           |
+| `id`                                                                                      | *String*                                                                                  | :heavy_check_mark:                                                                        | N/A                                                                                       |                                                                                           |
+| `emailAddress`                                                                            | *String*                                                                                  | :heavy_check_mark:                                                                        | N/A                                                                                       |                                                                                           |
+| `publicMetadata`                                                                          | [Optional<InvitationPublicMetadata>](../../models/components/InvitationPublicMetadata.md) | :heavy_minus_sign:                                                                        | N/A                                                                                       |                                                                                           |
+| `revoked`                                                                                 | *Optional<Boolean>*                                                                       | :heavy_minus_sign:                                                                        | N/A                                                                                       | false                                                                                     |
+| `status`                                                                                  | [InvitationStatus](../../models/components/InvitationStatus.md)                           | :heavy_check_mark:                                                                        | N/A                                                                                       | pending                                                                                   |
+| `url`                                                                                     | *JsonNullable<String>*                                                                    | :heavy_minus_sign:                                                                        | N/A                                                                                       |                                                                                           |
+| `createdAt`                                                                               | *long*                                                                                    | :heavy_check_mark:                                                                        | Unix timestamp of creation.<br/>                                                          |                                                                                           |
+| `updatedAt`                                                                               | *long*                                                                                    | :heavy_check_mark:                                                                        | Unix timestamp of last update.<br/>                                                       |                                                                                           |
\ No newline at end of file
diff --git a/docs/models/components/InvitationRevoked.md b/docs/models/components/InvitationRevoked.md
index e4b1dae..807dc10 100644
--- a/docs/models/components/InvitationRevoked.md
+++ b/docs/models/components/InvitationRevoked.md
@@ -3,14 +3,14 @@
 
 ## Fields
 
-| Field                                                                                                                                                     | Type                                                                                                                                                      | Required                                                                                                                                                  | Description                                                                                                                                               | Example                                                                                                                                                   |
-| --------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                                                                  | [com.clerk.backend_api.models.components.InvitationRevokedObject](../../models/components/InvitationRevokedObject.md)                                     | :heavy_check_mark:                                                                                                                                        | N/A                                                                                                                                                       |                                                                                                                                                           |
-| `id`                                                                                                                                                      | *String*                                                                                                                                                  | :heavy_check_mark:                                                                                                                                        | N/A                                                                                                                                                       |                                                                                                                                                           |
-| `emailAddress`                                                                                                                                            | *String*                                                                                                                                                  | :heavy_check_mark:                                                                                                                                        | N/A                                                                                                                                                       |                                                                                                                                                           |
-| `publicMetadata`                                                                                                                                          | [Optional<? extends com.clerk.backend_api.models.components.InvitationRevokedPublicMetadata>](../../models/components/InvitationRevokedPublicMetadata.md) | :heavy_minus_sign:                                                                                                                                        | N/A                                                                                                                                                       |                                                                                                                                                           |
-| `revoked`                                                                                                                                                 | *Optional<? extends Boolean>*                                                                                                                             | :heavy_minus_sign:                                                                                                                                        | N/A                                                                                                                                                       | true                                                                                                                                                      |
-| `status`                                                                                                                                                  | [com.clerk.backend_api.models.components.InvitationRevokedStatus](../../models/components/InvitationRevokedStatus.md)                                     | :heavy_check_mark:                                                                                                                                        | N/A                                                                                                                                                       | revoked                                                                                                                                                   |
-| `url`                                                                                                                                                     | *JsonNullable<? extends String>*                                                                                                                          | :heavy_minus_sign:                                                                                                                                        | N/A                                                                                                                                                       |                                                                                                                                                           |
-| `createdAt`                                                                                                                                               | *long*                                                                                                                                                    | :heavy_check_mark:                                                                                                                                        | Unix timestamp of creation.<br/>                                                                                                                          |                                                                                                                                                           |
-| `updatedAt`                                                                                                                                               | *long*                                                                                                                                                    | :heavy_check_mark:                                                                                                                                        | Unix timestamp of last update.<br/>                                                                                                                       |                                                                                                                                                           |
\ No newline at end of file
+| Field                                                                                                   | Type                                                                                                    | Required                                                                                                | Description                                                                                             | Example                                                                                                 |
+| ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- |
+| `object`                                                                                                | [InvitationRevokedObject](../../models/components/InvitationRevokedObject.md)                           | :heavy_check_mark:                                                                                      | N/A                                                                                                     |                                                                                                         |
+| `id`                                                                                                    | *String*                                                                                                | :heavy_check_mark:                                                                                      | N/A                                                                                                     |                                                                                                         |
+| `emailAddress`                                                                                          | *String*                                                                                                | :heavy_check_mark:                                                                                      | N/A                                                                                                     |                                                                                                         |
+| `publicMetadata`                                                                                        | [Optional<InvitationRevokedPublicMetadata>](../../models/components/InvitationRevokedPublicMetadata.md) | :heavy_minus_sign:                                                                                      | N/A                                                                                                     |                                                                                                         |
+| `revoked`                                                                                               | *Optional<Boolean>*                                                                                     | :heavy_minus_sign:                                                                                      | N/A                                                                                                     | true                                                                                                    |
+| `status`                                                                                                | [InvitationRevokedStatus](../../models/components/InvitationRevokedStatus.md)                           | :heavy_check_mark:                                                                                      | N/A                                                                                                     | revoked                                                                                                 |
+| `url`                                                                                                   | *JsonNullable<String>*                                                                                  | :heavy_minus_sign:                                                                                      | N/A                                                                                                     |                                                                                                         |
+| `createdAt`                                                                                             | *long*                                                                                                  | :heavy_check_mark:                                                                                      | Unix timestamp of creation.<br/>                                                                        |                                                                                                         |
+| `updatedAt`                                                                                             | *long*                                                                                                  | :heavy_check_mark:                                                                                      | Unix timestamp of last update.<br/>                                                                     |                                                                                                         |
\ No newline at end of file
diff --git a/docs/models/components/JWTTemplate.md b/docs/models/components/JWTTemplate.md
index 663321c..0ff3d7b 100644
--- a/docs/models/components/JWTTemplate.md
+++ b/docs/models/components/JWTTemplate.md
@@ -3,15 +3,15 @@
 
 ## Fields
 
-| Field                                                                                                     | Type                                                                                                      | Required                                                                                                  | Description                                                                                               |
-| --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                  | [com.clerk.backend_api.models.components.JWTTemplateObject](../../models/components/JWTTemplateObject.md) | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `id`                                                                                                      | *String*                                                                                                  | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `name`                                                                                                    | *String*                                                                                                  | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `claims`                                                                                                  | [com.clerk.backend_api.models.components.Claims](../../models/components/Claims.md)                       | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `lifetime`                                                                                                | *long*                                                                                                    | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `allowedClockSkew`                                                                                        | *long*                                                                                                    | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `customSigningKey`                                                                                        | *Optional<? extends Boolean>*                                                                             | :heavy_minus_sign:                                                                                        | N/A                                                                                                       |
-| `signingAlgorithm`                                                                                        | *Optional<? extends String>*                                                                              | :heavy_minus_sign:                                                                                        | N/A                                                                                                       |
-| `createdAt`                                                                                               | *long*                                                                                                    | :heavy_check_mark:                                                                                        | Unix timestamp of creation.<br/>                                                                          |
-| `updatedAt`                                                                                               | *long*                                                                                                    | :heavy_check_mark:                                                                                        | Unix timestamp of last update.<br/>                                                                       |
\ No newline at end of file
+| Field                                                             | Type                                                              | Required                                                          | Description                                                       |
+| ----------------------------------------------------------------- | ----------------------------------------------------------------- | ----------------------------------------------------------------- | ----------------------------------------------------------------- |
+| `object`                                                          | [JWTTemplateObject](../../models/components/JWTTemplateObject.md) | :heavy_check_mark:                                                | N/A                                                               |
+| `id`                                                              | *String*                                                          | :heavy_check_mark:                                                | N/A                                                               |
+| `name`                                                            | *String*                                                          | :heavy_check_mark:                                                | N/A                                                               |
+| `claims`                                                          | [Claims](../../models/components/Claims.md)                       | :heavy_check_mark:                                                | N/A                                                               |
+| `lifetime`                                                        | *long*                                                            | :heavy_check_mark:                                                | N/A                                                               |
+| `allowedClockSkew`                                                | *long*                                                            | :heavy_check_mark:                                                | N/A                                                               |
+| `customSigningKey`                                                | *Optional<Boolean>*                                               | :heavy_minus_sign:                                                | N/A                                                               |
+| `signingAlgorithm`                                                | *Optional<String>*                                                | :heavy_minus_sign:                                                | N/A                                                               |
+| `createdAt`                                                       | *long*                                                            | :heavy_check_mark:                                                | Unix timestamp of creation.<br/>                                  |
+| `updatedAt`                                                       | *long*                                                            | :heavy_check_mark:                                                | Unix timestamp of last update.<br/>                               |
\ No newline at end of file
diff --git a/docs/models/components/OAuthApplication.md b/docs/models/components/OAuthApplication.md
index a6cc9b8..44962e4 100644
--- a/docs/models/components/OAuthApplication.md
+++ b/docs/models/components/OAuthApplication.md
@@ -3,18 +3,18 @@
 
 ## Fields
 
-| Field                                                                                                               | Type                                                                                                                | Required                                                                                                            | Description                                                                                                         |
-| ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                            | [com.clerk.backend_api.models.components.OAuthApplicationObject](../../models/components/OAuthApplicationObject.md) | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `id`                                                                                                                | *String*                                                                                                            | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `instanceId`                                                                                                        | *String*                                                                                                            | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `name`                                                                                                              | *String*                                                                                                            | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `clientId`                                                                                                          | *String*                                                                                                            | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `public_`                                                                                                           | *boolean*                                                                                                           | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `scopes`                                                                                                            | *String*                                                                                                            | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `callbackUrl`                                                                                                       | *String*                                                                                                            | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `authorizeUrl`                                                                                                      | *String*                                                                                                            | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `tokenFetchUrl`                                                                                                     | *String*                                                                                                            | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `userInfoUrl`                                                                                                       | *String*                                                                                                            | :heavy_check_mark:                                                                                                  | N/A                                                                                                                 |
-| `createdAt`                                                                                                         | *long*                                                                                                              | :heavy_check_mark:                                                                                                  | Unix timestamp of creation.<br/>                                                                                    |
-| `updatedAt`                                                                                                         | *long*                                                                                                              | :heavy_check_mark:                                                                                                  | Unix timestamp of last update.<br/>                                                                                 |
\ No newline at end of file
+| Field                                                                       | Type                                                                        | Required                                                                    | Description                                                                 |
+| --------------------------------------------------------------------------- | --------------------------------------------------------------------------- | --------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
+| `object`                                                                    | [OAuthApplicationObject](../../models/components/OAuthApplicationObject.md) | :heavy_check_mark:                                                          | N/A                                                                         |
+| `id`                                                                        | *String*                                                                    | :heavy_check_mark:                                                          | N/A                                                                         |
+| `instanceId`                                                                | *String*                                                                    | :heavy_check_mark:                                                          | N/A                                                                         |
+| `name`                                                                      | *String*                                                                    | :heavy_check_mark:                                                          | N/A                                                                         |
+| `clientId`                                                                  | *String*                                                                    | :heavy_check_mark:                                                          | N/A                                                                         |
+| `public_`                                                                   | *boolean*                                                                   | :heavy_check_mark:                                                          | N/A                                                                         |
+| `scopes`                                                                    | *String*                                                                    | :heavy_check_mark:                                                          | N/A                                                                         |
+| `callbackUrl`                                                               | *String*                                                                    | :heavy_check_mark:                                                          | N/A                                                                         |
+| `authorizeUrl`                                                              | *String*                                                                    | :heavy_check_mark:                                                          | N/A                                                                         |
+| `tokenFetchUrl`                                                             | *String*                                                                    | :heavy_check_mark:                                                          | N/A                                                                         |
+| `userInfoUrl`                                                               | *String*                                                                    | :heavy_check_mark:                                                          | N/A                                                                         |
+| `createdAt`                                                                 | *long*                                                                      | :heavy_check_mark:                                                          | Unix timestamp of creation.<br/>                                            |
+| `updatedAt`                                                                 | *long*                                                                      | :heavy_check_mark:                                                          | Unix timestamp of last update.<br/>                                         |
\ No newline at end of file
diff --git a/docs/models/components/OAuthApplicationWithSecret.md b/docs/models/components/OAuthApplicationWithSecret.md
index 7ed81ee..3e63c05 100644
--- a/docs/models/components/OAuthApplicationWithSecret.md
+++ b/docs/models/components/OAuthApplicationWithSecret.md
@@ -3,19 +3,19 @@
 
 ## Fields
 
-| Field                                                                                                                                   | Type                                                                                                                                    | Required                                                                                                                                | Description                                                                                                                             |
-| --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                                                | [com.clerk.backend_api.models.components.OAuthApplicationWithSecretObject](../../models/components/OAuthApplicationWithSecretObject.md) | :heavy_check_mark:                                                                                                                      | N/A                                                                                                                                     |
-| `id`                                                                                                                                    | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | N/A                                                                                                                                     |
-| `instanceId`                                                                                                                            | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | N/A                                                                                                                                     |
-| `name`                                                                                                                                  | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | N/A                                                                                                                                     |
-| `clientId`                                                                                                                              | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | N/A                                                                                                                                     |
-| `public_`                                                                                                                               | *boolean*                                                                                                                               | :heavy_check_mark:                                                                                                                      | N/A                                                                                                                                     |
-| `scopes`                                                                                                                                | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | N/A                                                                                                                                     |
-| `callbackUrl`                                                                                                                           | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | N/A                                                                                                                                     |
-| `authorizeUrl`                                                                                                                          | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | N/A                                                                                                                                     |
-| `tokenFetchUrl`                                                                                                                         | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | N/A                                                                                                                                     |
-| `userInfoUrl`                                                                                                                           | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | N/A                                                                                                                                     |
-| `createdAt`                                                                                                                             | *long*                                                                                                                                  | :heavy_check_mark:                                                                                                                      | Unix timestamp of creation.<br/>                                                                                                        |
-| `updatedAt`                                                                                                                             | *long*                                                                                                                                  | :heavy_check_mark:                                                                                                                      | Unix timestamp of last update.<br/>                                                                                                     |
-| `clientSecret`                                                                                                                          | *Optional<? extends String>*                                                                                                            | :heavy_minus_sign:                                                                                                                      | Empty if public client.<br/>                                                                                                            |
\ No newline at end of file
+| Field                                                                                           | Type                                                                                            | Required                                                                                        | Description                                                                                     |
+| ----------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- |
+| `object`                                                                                        | [OAuthApplicationWithSecretObject](../../models/components/OAuthApplicationWithSecretObject.md) | :heavy_check_mark:                                                                              | N/A                                                                                             |
+| `id`                                                                                            | *String*                                                                                        | :heavy_check_mark:                                                                              | N/A                                                                                             |
+| `instanceId`                                                                                    | *String*                                                                                        | :heavy_check_mark:                                                                              | N/A                                                                                             |
+| `name`                                                                                          | *String*                                                                                        | :heavy_check_mark:                                                                              | N/A                                                                                             |
+| `clientId`                                                                                      | *String*                                                                                        | :heavy_check_mark:                                                                              | N/A                                                                                             |
+| `public_`                                                                                       | *boolean*                                                                                       | :heavy_check_mark:                                                                              | N/A                                                                                             |
+| `scopes`                                                                                        | *String*                                                                                        | :heavy_check_mark:                                                                              | N/A                                                                                             |
+| `callbackUrl`                                                                                   | *String*                                                                                        | :heavy_check_mark:                                                                              | N/A                                                                                             |
+| `authorizeUrl`                                                                                  | *String*                                                                                        | :heavy_check_mark:                                                                              | N/A                                                                                             |
+| `tokenFetchUrl`                                                                                 | *String*                                                                                        | :heavy_check_mark:                                                                              | N/A                                                                                             |
+| `userInfoUrl`                                                                                   | *String*                                                                                        | :heavy_check_mark:                                                                              | N/A                                                                                             |
+| `createdAt`                                                                                     | *long*                                                                                          | :heavy_check_mark:                                                                              | Unix timestamp of creation.<br/>                                                                |
+| `updatedAt`                                                                                     | *long*                                                                                          | :heavy_check_mark:                                                                              | Unix timestamp of last update.<br/>                                                             |
+| `clientSecret`                                                                                  | *Optional<String>*                                                                              | :heavy_minus_sign:                                                                              | Empty if public client.<br/>                                                                    |
\ No newline at end of file
diff --git a/docs/models/components/OAuthApplications.md b/docs/models/components/OAuthApplications.md
index 9f6647c..35f03ef 100644
--- a/docs/models/components/OAuthApplications.md
+++ b/docs/models/components/OAuthApplications.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                         | Type                                                                                                          | Required                                                                                                      | Description                                                                                                   |
-| ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
-| `data`                                                                                                        | List<[com.clerk.backend_api.models.components.OAuthApplication](../../models/components/OAuthApplication.md)> | :heavy_check_mark:                                                                                            | N/A                                                                                                           |
-| `totalCount`                                                                                                  | *long*                                                                                                        | :heavy_check_mark:                                                                                            | Total number of OAuth applications<br/>                                                                       |
\ No newline at end of file
+| Field                                                                 | Type                                                                  | Required                                                              | Description                                                           |
+| --------------------------------------------------------------------- | --------------------------------------------------------------------- | --------------------------------------------------------------------- | --------------------------------------------------------------------- |
+| `data`                                                                | List<[OAuthApplication](../../models/components/OAuthApplication.md)> | :heavy_check_mark:                                                    | N/A                                                                   |
+| `totalCount`                                                          | *long*                                                                | :heavy_check_mark:                                                    | Total number of OAuth applications<br/>                               |
\ No newline at end of file
diff --git a/docs/models/components/Oauth.md b/docs/models/components/Oauth.md
index 84f2480..2f32a84 100644
--- a/docs/models/components/Oauth.md
+++ b/docs/models/components/Oauth.md
@@ -3,11 +3,11 @@
 
 ## Fields
 
-| Field                                                                                                                     | Type                                                                                                                      | Required                                                                                                                  | Description                                                                                                               |
-| ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
-| `status`                                                                                                                  | [com.clerk.backend_api.models.components.OauthVerificationStatus](../../models/components/OauthVerificationStatus.md)     | :heavy_check_mark:                                                                                                        | N/A                                                                                                                       |
-| `strategy`                                                                                                                | [com.clerk.backend_api.models.components.OauthVerificationStrategy](../../models/components/OauthVerificationStrategy.md) | :heavy_check_mark:                                                                                                        | N/A                                                                                                                       |
-| `externalVerificationRedirectUrl`                                                                                         | *Optional<? extends String>*                                                                                              | :heavy_minus_sign:                                                                                                        | N/A                                                                                                                       |
-| `error`                                                                                                                   | [JsonNullable<? extends com.clerk.backend_api.models.components.Error>](../../models/components/Error.md)                 | :heavy_minus_sign:                                                                                                        | N/A                                                                                                                       |
-| `expireAt`                                                                                                                | *long*                                                                                                                    | :heavy_check_mark:                                                                                                        | N/A                                                                                                                       |
-| `attempts`                                                                                                                | *JsonNullable<? extends Long>*                                                                                            | :heavy_minus_sign:                                                                                                        | N/A                                                                                                                       |
\ No newline at end of file
+| Field                                                                             | Type                                                                              | Required                                                                          | Description                                                                       |
+| --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- |
+| `status`                                                                          | [OauthVerificationStatus](../../models/components/OauthVerificationStatus.md)     | :heavy_check_mark:                                                                | N/A                                                                               |
+| `strategy`                                                                        | [OauthVerificationStrategy](../../models/components/OauthVerificationStrategy.md) | :heavy_check_mark:                                                                | N/A                                                                               |
+| `externalVerificationRedirectUrl`                                                 | *Optional<String>*                                                                | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `error`                                                                           | [JsonNullable<Error>](../../models/components/Error.md)                           | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `expireAt`                                                                        | *long*                                                                            | :heavy_check_mark:                                                                | N/A                                                                               |
+| `attempts`                                                                        | *JsonNullable<Long>*                                                              | :heavy_minus_sign:                                                                | N/A                                                                               |
\ No newline at end of file
diff --git a/docs/models/components/Organization.md b/docs/models/components/Organization.md
index 149093d..da5f751 100644
--- a/docs/models/components/Organization.md
+++ b/docs/models/components/Organization.md
@@ -3,17 +3,17 @@
 
 ## Fields
 
-| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
-| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                                      | [com.clerk.backend_api.models.components.OrganizationObject](../../models/components/OrganizationObject.md)                   | :heavy_check_mark:                                                                                                            | N/A                                                                                                                           |
-| `id`                                                                                                                          | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | N/A                                                                                                                           |
-| `name`                                                                                                                        | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | N/A                                                                                                                           |
-| `slug`                                                                                                                        | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | N/A                                                                                                                           |
-| `membersCount`                                                                                                                | *JsonNullable<? extends Long>*                                                                                                | :heavy_minus_sign:                                                                                                            | N/A                                                                                                                           |
-| `maxAllowedMemberships`                                                                                                       | *long*                                                                                                                        | :heavy_check_mark:                                                                                                            | N/A                                                                                                                           |
-| `adminDeleteEnabled`                                                                                                          | *Optional<? extends Boolean>*                                                                                                 | :heavy_minus_sign:                                                                                                            | N/A                                                                                                                           |
-| `publicMetadata`                                                                                                              | [com.clerk.backend_api.models.components.OrganizationPublicMetadata](../../models/components/OrganizationPublicMetadata.md)   | :heavy_check_mark:                                                                                                            | N/A                                                                                                                           |
-| `privateMetadata`                                                                                                             | [com.clerk.backend_api.models.components.OrganizationPrivateMetadata](../../models/components/OrganizationPrivateMetadata.md) | :heavy_check_mark:                                                                                                            | N/A                                                                                                                           |
-| `createdBy`                                                                                                                   | *Optional<? extends String>*                                                                                                  | :heavy_minus_sign:                                                                                                            | N/A                                                                                                                           |
-| `createdAt`                                                                                                                   | *long*                                                                                                                        | :heavy_check_mark:                                                                                                            | Unix timestamp of creation.<br/>                                                                                              |
-| `updatedAt`                                                                                                                   | *long*                                                                                                                        | :heavy_check_mark:                                                                                                            | Unix timestamp of last update.<br/>                                                                                           |
\ No newline at end of file
+| Field                                                                                 | Type                                                                                  | Required                                                                              | Description                                                                           |
+| ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
+| `object`                                                                              | [OrganizationObject](../../models/components/OrganizationObject.md)                   | :heavy_check_mark:                                                                    | N/A                                                                                   |
+| `id`                                                                                  | *String*                                                                              | :heavy_check_mark:                                                                    | N/A                                                                                   |
+| `name`                                                                                | *String*                                                                              | :heavy_check_mark:                                                                    | N/A                                                                                   |
+| `slug`                                                                                | *String*                                                                              | :heavy_check_mark:                                                                    | N/A                                                                                   |
+| `membersCount`                                                                        | *JsonNullable<Long>*                                                                  | :heavy_minus_sign:                                                                    | N/A                                                                                   |
+| `maxAllowedMemberships`                                                               | *long*                                                                                | :heavy_check_mark:                                                                    | N/A                                                                                   |
+| `adminDeleteEnabled`                                                                  | *Optional<Boolean>*                                                                   | :heavy_minus_sign:                                                                    | N/A                                                                                   |
+| `publicMetadata`                                                                      | [OrganizationPublicMetadata](../../models/components/OrganizationPublicMetadata.md)   | :heavy_check_mark:                                                                    | N/A                                                                                   |
+| `privateMetadata`                                                                     | [OrganizationPrivateMetadata](../../models/components/OrganizationPrivateMetadata.md) | :heavy_check_mark:                                                                    | N/A                                                                                   |
+| `createdBy`                                                                           | *Optional<String>*                                                                    | :heavy_minus_sign:                                                                    | N/A                                                                                   |
+| `createdAt`                                                                           | *long*                                                                                | :heavy_check_mark:                                                                    | Unix timestamp of creation.<br/>                                                      |
+| `updatedAt`                                                                           | *long*                                                                                | :heavy_check_mark:                                                                    | Unix timestamp of last update.<br/>                                                   |
\ No newline at end of file
diff --git a/docs/models/components/OrganizationInvitation.md b/docs/models/components/OrganizationInvitation.md
index 2711ddd..fdcb823 100644
--- a/docs/models/components/OrganizationInvitation.md
+++ b/docs/models/components/OrganizationInvitation.md
@@ -5,15 +5,15 @@ An organization invitation
 
 ## Fields
 
-| Field                                                                                                                                                                 | Type                                                                                                                                                                  | Required                                                                                                                                                              | Description                                                                                                                                                           |
-| --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `id`                                                                                                                                                                  | *Optional<? extends String>*                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                    | N/A                                                                                                                                                                   |
-| `object`                                                                                                                                                              | [Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitationObject>](../../models/components/OrganizationInvitationObject.md)                   | :heavy_minus_sign:                                                                                                                                                    | String representing the object's type. Objects of the same type share the same value.<br/>                                                                            |
-| `emailAddress`                                                                                                                                                        | *Optional<? extends String>*                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                    | N/A                                                                                                                                                                   |
-| `role`                                                                                                                                                                | *Optional<? extends String>*                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                    | N/A                                                                                                                                                                   |
-| `organizationId`                                                                                                                                                      | *Optional<? extends String>*                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                    | N/A                                                                                                                                                                   |
-| `status`                                                                                                                                                              | *Optional<? extends String>*                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                    | N/A                                                                                                                                                                   |
-| `publicMetadata`                                                                                                                                                      | [Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitationPublicMetadata>](../../models/components/OrganizationInvitationPublicMetadata.md)   | :heavy_minus_sign:                                                                                                                                                    | N/A                                                                                                                                                                   |
-| `privateMetadata`                                                                                                                                                     | [Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitationPrivateMetadata>](../../models/components/OrganizationInvitationPrivateMetadata.md) | :heavy_minus_sign:                                                                                                                                                    | N/A                                                                                                                                                                   |
-| `createdAt`                                                                                                                                                           | *Optional<? extends Long>*                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                    | Unix timestamp of creation.                                                                                                                                           |
-| `updatedAt`                                                                                                                                                           | *Optional<? extends Long>*                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                    | Unix timestamp of last update.                                                                                                                                        |
\ No newline at end of file
+| Field                                                                                                               | Type                                                                                                                | Required                                                                                                            | Description                                                                                                         |
+| ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
+| `id`                                                                                                                | *Optional<String>*                                                                                                  | :heavy_minus_sign:                                                                                                  | N/A                                                                                                                 |
+| `object`                                                                                                            | [Optional<OrganizationInvitationObject>](../../models/components/OrganizationInvitationObject.md)                   | :heavy_minus_sign:                                                                                                  | String representing the object's type. Objects of the same type share the same value.<br/>                          |
+| `emailAddress`                                                                                                      | *Optional<String>*                                                                                                  | :heavy_minus_sign:                                                                                                  | N/A                                                                                                                 |
+| `role`                                                                                                              | *Optional<String>*                                                                                                  | :heavy_minus_sign:                                                                                                  | N/A                                                                                                                 |
+| `organizationId`                                                                                                    | *Optional<String>*                                                                                                  | :heavy_minus_sign:                                                                                                  | N/A                                                                                                                 |
+| `status`                                                                                                            | *Optional<String>*                                                                                                  | :heavy_minus_sign:                                                                                                  | N/A                                                                                                                 |
+| `publicMetadata`                                                                                                    | [Optional<OrganizationInvitationPublicMetadata>](../../models/components/OrganizationInvitationPublicMetadata.md)   | :heavy_minus_sign:                                                                                                  | N/A                                                                                                                 |
+| `privateMetadata`                                                                                                   | [Optional<OrganizationInvitationPrivateMetadata>](../../models/components/OrganizationInvitationPrivateMetadata.md) | :heavy_minus_sign:                                                                                                  | N/A                                                                                                                 |
+| `createdAt`                                                                                                         | *Optional<Long>*                                                                                                    | :heavy_minus_sign:                                                                                                  | Unix timestamp of creation.                                                                                         |
+| `updatedAt`                                                                                                         | *Optional<Long>*                                                                                                    | :heavy_minus_sign:                                                                                                  | Unix timestamp of last update.                                                                                      |
\ No newline at end of file
diff --git a/docs/models/components/OrganizationInvitations.md b/docs/models/components/OrganizationInvitations.md
index a04087d..eacc98d 100644
--- a/docs/models/components/OrganizationInvitations.md
+++ b/docs/models/components/OrganizationInvitations.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                     | Type                                                                                                                      | Required                                                                                                                  | Description                                                                                                               |
-| ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
-| `data`                                                                                                                    | List<[com.clerk.backend_api.models.components.OrganizationInvitation](../../models/components/OrganizationInvitation.md)> | :heavy_check_mark:                                                                                                        | N/A                                                                                                                       |
-| `totalCount`                                                                                                              | *long*                                                                                                                    | :heavy_check_mark:                                                                                                        | Total number of organization invitations<br/>                                                                             |
\ No newline at end of file
+| Field                                                                             | Type                                                                              | Required                                                                          | Description                                                                       |
+| --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- |
+| `data`                                                                            | List<[OrganizationInvitation](../../models/components/OrganizationInvitation.md)> | :heavy_check_mark:                                                                | N/A                                                                               |
+| `totalCount`                                                                      | *long*                                                                            | :heavy_check_mark:                                                                | Total number of organization invitations<br/>                                     |
\ No newline at end of file
diff --git a/docs/models/components/OrganizationMembership.md b/docs/models/components/OrganizationMembership.md
index 031561a..d4178da 100644
--- a/docs/models/components/OrganizationMembership.md
+++ b/docs/models/components/OrganizationMembership.md
@@ -5,15 +5,15 @@ Hello world
 
 ## Fields
 
-| Field                                                                                                                                                                 | Type                                                                                                                                                                  | Required                                                                                                                                                              | Description                                                                                                                                                           |
-| --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `id`                                                                                                                                                                  | *Optional<? extends String>*                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                    | N/A                                                                                                                                                                   |
-| `object`                                                                                                                                                              | [Optional<? extends com.clerk.backend_api.models.components.OrganizationMembershipObject>](../../models/components/OrganizationMembershipObject.md)                   | :heavy_minus_sign:                                                                                                                                                    | String representing the object's type. Objects of the same type share the same value.<br/>                                                                            |
-| `role`                                                                                                                                                                | *Optional<? extends String>*                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                    | N/A                                                                                                                                                                   |
-| `permissions`                                                                                                                                                         | List<*String*>                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                    | N/A                                                                                                                                                                   |
-| `publicMetadata`                                                                                                                                                      | [Optional<? extends com.clerk.backend_api.models.components.OrganizationMembershipPublicMetadata>](../../models/components/OrganizationMembershipPublicMetadata.md)   | :heavy_minus_sign:                                                                                                                                                    | Metadata saved on the organization membership, accessible from both Frontend and Backend APIs                                                                         |
-| `privateMetadata`                                                                                                                                                     | [Optional<? extends com.clerk.backend_api.models.components.OrganizationMembershipPrivateMetadata>](../../models/components/OrganizationMembershipPrivateMetadata.md) | :heavy_minus_sign:                                                                                                                                                    | Metadata saved on the organization membership, accessible only from the Backend API                                                                                   |
-| `organization`                                                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.components.OrganizationMembershipOrganization>](../../models/components/OrganizationMembershipOrganization.md)       | :heavy_minus_sign:                                                                                                                                                    | N/A                                                                                                                                                                   |
-| `publicUserData`                                                                                                                                                      | [Optional<? extends com.clerk.backend_api.models.components.PublicUserData>](../../models/components/PublicUserData.md)                                               | :heavy_minus_sign:                                                                                                                                                    | N/A                                                                                                                                                                   |
-| `createdAt`                                                                                                                                                           | *Optional<? extends Long>*                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                    | Unix timestamp of creation.                                                                                                                                           |
-| `updatedAt`                                                                                                                                                           | *Optional<? extends Long>*                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                    | Unix timestamp of last update.                                                                                                                                        |
\ No newline at end of file
+| Field                                                                                                               | Type                                                                                                                | Required                                                                                                            | Description                                                                                                         |
+| ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
+| `id`                                                                                                                | *Optional<String>*                                                                                                  | :heavy_minus_sign:                                                                                                  | N/A                                                                                                                 |
+| `object`                                                                                                            | [Optional<OrganizationMembershipObject>](../../models/components/OrganizationMembershipObject.md)                   | :heavy_minus_sign:                                                                                                  | String representing the object's type. Objects of the same type share the same value.<br/>                          |
+| `role`                                                                                                              | *Optional<String>*                                                                                                  | :heavy_minus_sign:                                                                                                  | N/A                                                                                                                 |
+| `permissions`                                                                                                       | List<*String*>                                                                                                      | :heavy_minus_sign:                                                                                                  | N/A                                                                                                                 |
+| `publicMetadata`                                                                                                    | [Optional<OrganizationMembershipPublicMetadata>](../../models/components/OrganizationMembershipPublicMetadata.md)   | :heavy_minus_sign:                                                                                                  | Metadata saved on the organization membership, accessible from both Frontend and Backend APIs                       |
+| `privateMetadata`                                                                                                   | [Optional<OrganizationMembershipPrivateMetadata>](../../models/components/OrganizationMembershipPrivateMetadata.md) | :heavy_minus_sign:                                                                                                  | Metadata saved on the organization membership, accessible only from the Backend API                                 |
+| `organization`                                                                                                      | [Optional<OrganizationMembershipOrganization>](../../models/components/OrganizationMembershipOrganization.md)       | :heavy_minus_sign:                                                                                                  | N/A                                                                                                                 |
+| `publicUserData`                                                                                                    | [Optional<PublicUserData>](../../models/components/PublicUserData.md)                                               | :heavy_minus_sign:                                                                                                  | N/A                                                                                                                 |
+| `createdAt`                                                                                                         | *Optional<Long>*                                                                                                    | :heavy_minus_sign:                                                                                                  | Unix timestamp of creation.                                                                                         |
+| `updatedAt`                                                                                                         | *Optional<Long>*                                                                                                    | :heavy_minus_sign:                                                                                                  | Unix timestamp of last update.                                                                                      |
\ No newline at end of file
diff --git a/docs/models/components/OrganizationMembershipOrganization.md b/docs/models/components/OrganizationMembershipOrganization.md
index 22acd4c..4bad1ca 100644
--- a/docs/models/components/OrganizationMembershipOrganization.md
+++ b/docs/models/components/OrganizationMembershipOrganization.md
@@ -3,17 +3,17 @@
 
 ## Fields
 
-| Field                                                                                                                                                                     | Type                                                                                                                                                                      | Required                                                                                                                                                                  | Description                                                                                                                                                               |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                                                                                  | [com.clerk.backend_api.models.components.OrganizationMembershipOrganizationObject](../../models/components/OrganizationMembershipOrganizationObject.md)                   | :heavy_check_mark:                                                                                                                                                        | N/A                                                                                                                                                                       |
-| `id`                                                                                                                                                                      | *String*                                                                                                                                                                  | :heavy_check_mark:                                                                                                                                                        | N/A                                                                                                                                                                       |
-| `name`                                                                                                                                                                    | *String*                                                                                                                                                                  | :heavy_check_mark:                                                                                                                                                        | N/A                                                                                                                                                                       |
-| `slug`                                                                                                                                                                    | *String*                                                                                                                                                                  | :heavy_check_mark:                                                                                                                                                        | N/A                                                                                                                                                                       |
-| `membersCount`                                                                                                                                                            | *JsonNullable<? extends Long>*                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                        | N/A                                                                                                                                                                       |
-| `maxAllowedMemberships`                                                                                                                                                   | *long*                                                                                                                                                                    | :heavy_check_mark:                                                                                                                                                        | N/A                                                                                                                                                                       |
-| `adminDeleteEnabled`                                                                                                                                                      | *Optional<? extends Boolean>*                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                        | N/A                                                                                                                                                                       |
-| `publicMetadata`                                                                                                                                                          | [com.clerk.backend_api.models.components.OrganizationMembershipOrganizationPublicMetadata](../../models/components/OrganizationMembershipOrganizationPublicMetadata.md)   | :heavy_check_mark:                                                                                                                                                        | N/A                                                                                                                                                                       |
-| `privateMetadata`                                                                                                                                                         | [com.clerk.backend_api.models.components.OrganizationMembershipOrganizationPrivateMetadata](../../models/components/OrganizationMembershipOrganizationPrivateMetadata.md) | :heavy_check_mark:                                                                                                                                                        | N/A                                                                                                                                                                       |
-| `createdBy`                                                                                                                                                               | *Optional<? extends String>*                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                        | N/A                                                                                                                                                                       |
-| `createdAt`                                                                                                                                                               | *long*                                                                                                                                                                    | :heavy_check_mark:                                                                                                                                                        | Unix timestamp of creation.<br/>                                                                                                                                          |
-| `updatedAt`                                                                                                                                                               | *long*                                                                                                                                                                    | :heavy_check_mark:                                                                                                                                                        | Unix timestamp of last update.<br/>                                                                                                                                       |
\ No newline at end of file
+| Field                                                                                                                             | Type                                                                                                                              | Required                                                                                                                          | Description                                                                                                                       |
+| --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
+| `object`                                                                                                                          | [OrganizationMembershipOrganizationObject](../../models/components/OrganizationMembershipOrganizationObject.md)                   | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
+| `id`                                                                                                                              | *String*                                                                                                                          | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
+| `name`                                                                                                                            | *String*                                                                                                                          | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
+| `slug`                                                                                                                            | *String*                                                                                                                          | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
+| `membersCount`                                                                                                                    | *JsonNullable<Long>*                                                                                                              | :heavy_minus_sign:                                                                                                                | N/A                                                                                                                               |
+| `maxAllowedMemberships`                                                                                                           | *long*                                                                                                                            | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
+| `adminDeleteEnabled`                                                                                                              | *Optional<Boolean>*                                                                                                               | :heavy_minus_sign:                                                                                                                | N/A                                                                                                                               |
+| `publicMetadata`                                                                                                                  | [OrganizationMembershipOrganizationPublicMetadata](../../models/components/OrganizationMembershipOrganizationPublicMetadata.md)   | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
+| `privateMetadata`                                                                                                                 | [OrganizationMembershipOrganizationPrivateMetadata](../../models/components/OrganizationMembershipOrganizationPrivateMetadata.md) | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
+| `createdBy`                                                                                                                       | *Optional<String>*                                                                                                                | :heavy_minus_sign:                                                                                                                | N/A                                                                                                                               |
+| `createdAt`                                                                                                                       | *long*                                                                                                                            | :heavy_check_mark:                                                                                                                | Unix timestamp of creation.<br/>                                                                                                  |
+| `updatedAt`                                                                                                                       | *long*                                                                                                                            | :heavy_check_mark:                                                                                                                | Unix timestamp of last update.<br/>                                                                                               |
\ No newline at end of file
diff --git a/docs/models/components/OrganizationMemberships.md b/docs/models/components/OrganizationMemberships.md
index 9cca8c4..8bbc80e 100644
--- a/docs/models/components/OrganizationMemberships.md
+++ b/docs/models/components/OrganizationMemberships.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                     | Type                                                                                                                      | Required                                                                                                                  | Description                                                                                                               |
-| ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
-| `data`                                                                                                                    | List<[com.clerk.backend_api.models.components.OrganizationMembership](../../models/components/OrganizationMembership.md)> | :heavy_check_mark:                                                                                                        | N/A                                                                                                                       |
-| `totalCount`                                                                                                              | *long*                                                                                                                    | :heavy_check_mark:                                                                                                        | Total number of organization memberships<br/>                                                                             |
\ No newline at end of file
+| Field                                                                             | Type                                                                              | Required                                                                          | Description                                                                       |
+| --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- |
+| `data`                                                                            | List<[OrganizationMembership](../../models/components/OrganizationMembership.md)> | :heavy_check_mark:                                                                | N/A                                                                               |
+| `totalCount`                                                                      | *long*                                                                            | :heavy_check_mark:                                                                | Total number of organization memberships<br/>                                     |
\ No newline at end of file
diff --git a/docs/models/components/OrganizationSettings.md b/docs/models/components/OrganizationSettings.md
index 8e1095c..108eac4 100644
--- a/docs/models/components/OrganizationSettings.md
+++ b/docs/models/components/OrganizationSettings.md
@@ -3,15 +3,15 @@
 
 ## Fields
 
-| Field                                                                                                                       | Type                                                                                                                        | Required                                                                                                                    | Description                                                                                                                 |
-| --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                                    | [com.clerk.backend_api.models.components.OrganizationSettingsObject](../../models/components/OrganizationSettingsObject.md) | :heavy_check_mark:                                                                                                          | String representing the object's type. Objects of the same type share the same value.                                       |
-| `enabled`                                                                                                                   | *boolean*                                                                                                                   | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `maxAllowedMemberships`                                                                                                     | *long*                                                                                                                      | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `maxAllowedRoles`                                                                                                           | *Optional<? extends Long>*                                                                                                  | :heavy_minus_sign:                                                                                                          | N/A                                                                                                                         |
-| `maxAllowedPermissions`                                                                                                     | *Optional<? extends Long>*                                                                                                  | :heavy_minus_sign:                                                                                                          | N/A                                                                                                                         |
-| `creatorRole`                                                                                                               | *String*                                                                                                                    | :heavy_check_mark:                                                                                                          | The role key that a user will be assigned after creating an organization.                                                   |
-| `adminDeleteEnabled`                                                                                                        | *boolean*                                                                                                                   | :heavy_check_mark:                                                                                                          | The default for whether an admin can delete an organization with the Frontend API.                                          |
-| `domainsEnabled`                                                                                                            | *boolean*                                                                                                                   | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `domainsEnrollmentModes`                                                                                                    | List<[com.clerk.backend_api.models.components.DomainsEnrollmentModes](../../models/components/DomainsEnrollmentModes.md)>   | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `domainsDefaultRole`                                                                                                        | *String*                                                                                                                    | :heavy_check_mark:                                                                                                          | The role key that it will be used in order to create an organization invitation or suggestion.                              |
\ No newline at end of file
+| Field                                                                                          | Type                                                                                           | Required                                                                                       | Description                                                                                    |
+| ---------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- |
+| `object`                                                                                       | [OrganizationSettingsObject](../../models/components/OrganizationSettingsObject.md)            | :heavy_check_mark:                                                                             | String representing the object's type. Objects of the same type share the same value.          |
+| `enabled`                                                                                      | *boolean*                                                                                      | :heavy_check_mark:                                                                             | N/A                                                                                            |
+| `maxAllowedMemberships`                                                                        | *long*                                                                                         | :heavy_check_mark:                                                                             | N/A                                                                                            |
+| `maxAllowedRoles`                                                                              | *Optional<Long>*                                                                               | :heavy_minus_sign:                                                                             | N/A                                                                                            |
+| `maxAllowedPermissions`                                                                        | *Optional<Long>*                                                                               | :heavy_minus_sign:                                                                             | N/A                                                                                            |
+| `creatorRole`                                                                                  | *String*                                                                                       | :heavy_check_mark:                                                                             | The role key that a user will be assigned after creating an organization.                      |
+| `adminDeleteEnabled`                                                                           | *boolean*                                                                                      | :heavy_check_mark:                                                                             | The default for whether an admin can delete an organization with the Frontend API.             |
+| `domainsEnabled`                                                                               | *boolean*                                                                                      | :heavy_check_mark:                                                                             | N/A                                                                                            |
+| `domainsEnrollmentModes`                                                                       | List<[DomainsEnrollmentModes](../../models/components/DomainsEnrollmentModes.md)>              | :heavy_check_mark:                                                                             | N/A                                                                                            |
+| `domainsDefaultRole`                                                                           | *String*                                                                                       | :heavy_check_mark:                                                                             | The role key that it will be used in order to create an organization invitation or suggestion. |
\ No newline at end of file
diff --git a/docs/models/components/OrganizationWithLogo.md b/docs/models/components/OrganizationWithLogo.md
index 6764d07..df649a7 100644
--- a/docs/models/components/OrganizationWithLogo.md
+++ b/docs/models/components/OrganizationWithLogo.md
@@ -3,20 +3,20 @@
 
 ## Fields
 
-| Field                                                                                                                                         | Type                                                                                                                                          | Required                                                                                                                                      | Description                                                                                                                                   |
-| --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                                                      | [com.clerk.backend_api.models.components.OrganizationWithLogoObject](../../models/components/OrganizationWithLogoObject.md)                   | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
-| `id`                                                                                                                                          | *String*                                                                                                                                      | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
-| `name`                                                                                                                                        | *String*                                                                                                                                      | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
-| `slug`                                                                                                                                        | *String*                                                                                                                                      | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
-| `membersCount`                                                                                                                                | *JsonNullable<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
-| `maxAllowedMemberships`                                                                                                                       | *long*                                                                                                                                        | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
-| `adminDeleteEnabled`                                                                                                                          | *Optional<? extends Boolean>*                                                                                                                 | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
-| `publicMetadata`                                                                                                                              | [com.clerk.backend_api.models.components.OrganizationWithLogoPublicMetadata](../../models/components/OrganizationWithLogoPublicMetadata.md)   | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
-| `privateMetadata`                                                                                                                             | [com.clerk.backend_api.models.components.OrganizationWithLogoPrivateMetadata](../../models/components/OrganizationWithLogoPrivateMetadata.md) | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
-| `createdBy`                                                                                                                                   | *Optional<? extends String>*                                                                                                                  | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
-| `createdAt`                                                                                                                                   | *long*                                                                                                                                        | :heavy_check_mark:                                                                                                                            | Unix timestamp of creation.<br/>                                                                                                              |
-| `updatedAt`                                                                                                                                   | *long*                                                                                                                                        | :heavy_check_mark:                                                                                                                            | Unix timestamp of last update.<br/>                                                                                                           |
-| ~~`logoUrl`~~                                                                                                                                 | *Optional<? extends String>*                                                                                                                  | :heavy_minus_sign:                                                                                                                            | : warning: ** DEPRECATED **: This will be removed in a future release, please migrate away from it as soon as possible.                       |
-| `imageUrl`                                                                                                                                    | *String*                                                                                                                                      | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
-| `hasImage`                                                                                                                                    | *Optional<? extends Boolean>*                                                                                                                 | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
\ No newline at end of file
+| Field                                                                                                                   | Type                                                                                                                    | Required                                                                                                                | Description                                                                                                             |
+| ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- |
+| `object`                                                                                                                | [OrganizationWithLogoObject](../../models/components/OrganizationWithLogoObject.md)                                     | :heavy_check_mark:                                                                                                      | N/A                                                                                                                     |
+| `id`                                                                                                                    | *String*                                                                                                                | :heavy_check_mark:                                                                                                      | N/A                                                                                                                     |
+| `name`                                                                                                                  | *String*                                                                                                                | :heavy_check_mark:                                                                                                      | N/A                                                                                                                     |
+| `slug`                                                                                                                  | *String*                                                                                                                | :heavy_check_mark:                                                                                                      | N/A                                                                                                                     |
+| `membersCount`                                                                                                          | *JsonNullable<Long>*                                                                                                    | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
+| `maxAllowedMemberships`                                                                                                 | *long*                                                                                                                  | :heavy_check_mark:                                                                                                      | N/A                                                                                                                     |
+| `adminDeleteEnabled`                                                                                                    | *Optional<Boolean>*                                                                                                     | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
+| `publicMetadata`                                                                                                        | [OrganizationWithLogoPublicMetadata](../../models/components/OrganizationWithLogoPublicMetadata.md)                     | :heavy_check_mark:                                                                                                      | N/A                                                                                                                     |
+| `privateMetadata`                                                                                                       | [OrganizationWithLogoPrivateMetadata](../../models/components/OrganizationWithLogoPrivateMetadata.md)                   | :heavy_check_mark:                                                                                                      | N/A                                                                                                                     |
+| `createdBy`                                                                                                             | *Optional<String>*                                                                                                      | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
+| `createdAt`                                                                                                             | *long*                                                                                                                  | :heavy_check_mark:                                                                                                      | Unix timestamp of creation.<br/>                                                                                        |
+| `updatedAt`                                                                                                             | *long*                                                                                                                  | :heavy_check_mark:                                                                                                      | Unix timestamp of last update.<br/>                                                                                     |
+| ~~`logoUrl`~~                                                                                                           | *Optional<String>*                                                                                                      | :heavy_minus_sign:                                                                                                      | : warning: ** DEPRECATED **: This will be removed in a future release, please migrate away from it as soon as possible. |
+| `imageUrl`                                                                                                              | *String*                                                                                                                | :heavy_check_mark:                                                                                                      | N/A                                                                                                                     |
+| `hasImage`                                                                                                              | *Optional<Boolean>*                                                                                                     | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
\ No newline at end of file
diff --git a/docs/models/components/Organizations.md b/docs/models/components/Organizations.md
index 03cac70..0580a72 100644
--- a/docs/models/components/Organizations.md
+++ b/docs/models/components/Organizations.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                 | Type                                                                                                  | Required                                                                                              | Description                                                                                           |
-| ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- |
-| `data`                                                                                                | List<[com.clerk.backend_api.models.components.Organization](../../models/components/Organization.md)> | :heavy_check_mark:                                                                                    | N/A                                                                                                   |
-| `totalCount`                                                                                          | *long*                                                                                                | :heavy_check_mark:                                                                                    | Total number of organizations<br/>                                                                    |
\ No newline at end of file
+| Field                                                         | Type                                                          | Required                                                      | Description                                                   |
+| ------------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- |
+| `data`                                                        | List<[Organization](../../models/components/Organization.md)> | :heavy_check_mark:                                            | N/A                                                           |
+| `totalCount`                                                  | *long*                                                        | :heavy_check_mark:                                            | Total number of organizations<br/>                            |
\ No newline at end of file
diff --git a/docs/models/components/Otp.md b/docs/models/components/Otp.md
index c92315e..46bdb90 100644
--- a/docs/models/components/Otp.md
+++ b/docs/models/components/Otp.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                       | Type                                                                                                        | Required                                                                                                    | Description                                                                                                 |
-| ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
-| `status`                                                                                                    | [com.clerk.backend_api.models.components.VerificationStatus](../../models/components/VerificationStatus.md) | :heavy_check_mark:                                                                                          | N/A                                                                                                         |
-| `strategy`                                                                                                  | [com.clerk.backend_api.models.components.Strategy](../../models/components/Strategy.md)                     | :heavy_check_mark:                                                                                          | N/A                                                                                                         |
-| `attempts`                                                                                                  | *long*                                                                                                      | :heavy_check_mark:                                                                                          | N/A                                                                                                         |
-| `expireAt`                                                                                                  | *long*                                                                                                      | :heavy_check_mark:                                                                                          | N/A                                                                                                         |
\ No newline at end of file
+| Field                                                               | Type                                                                | Required                                                            | Description                                                         |
+| ------------------------------------------------------------------- | ------------------------------------------------------------------- | ------------------------------------------------------------------- | ------------------------------------------------------------------- |
+| `status`                                                            | [VerificationStatus](../../models/components/VerificationStatus.md) | :heavy_check_mark:                                                  | N/A                                                                 |
+| `strategy`                                                          | [Strategy](../../models/components/Strategy.md)                     | :heavy_check_mark:                                                  | N/A                                                                 |
+| `attempts`                                                          | *Optional<Long>*                                                    | :heavy_minus_sign:                                                  | N/A                                                                 |
+| `expireAt`                                                          | *Optional<Long>*                                                    | :heavy_minus_sign:                                                  | N/A                                                                 |
\ No newline at end of file
diff --git a/docs/models/components/Passkey.md b/docs/models/components/Passkey.md
index 9b2202e..b733561 100644
--- a/docs/models/components/Passkey.md
+++ b/docs/models/components/Passkey.md
@@ -3,10 +3,10 @@
 
 ## Fields
 
-| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
-| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
-| `status`                                                                                                                      | [com.clerk.backend_api.models.components.PasskeyVerificationStatus](../../models/components/PasskeyVerificationStatus.md)     | :heavy_check_mark:                                                                                                            | N/A                                                                                                                           |
-| `strategy`                                                                                                                    | [com.clerk.backend_api.models.components.PasskeyVerificationStrategy](../../models/components/PasskeyVerificationStrategy.md) | :heavy_check_mark:                                                                                                            | N/A                                                                                                                           |
-| `nonce`                                                                                                                       | [Optional<? extends com.clerk.backend_api.models.components.VerificationNonce>](../../models/components/VerificationNonce.md) | :heavy_minus_sign:                                                                                                            | N/A                                                                                                                           |
-| `attempts`                                                                                                                    | *JsonNullable<? extends Long>*                                                                                                | :heavy_minus_sign:                                                                                                            | N/A                                                                                                                           |
-| `expireAt`                                                                                                                    | *JsonNullable<? extends Long>*                                                                                                | :heavy_minus_sign:                                                                                                            | N/A                                                                                                                           |
\ No newline at end of file
+| Field                                                                                 | Type                                                                                  | Required                                                                              | Description                                                                           |
+| ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
+| `status`                                                                              | [PasskeyVerificationStatus](../../models/components/PasskeyVerificationStatus.md)     | :heavy_check_mark:                                                                    | N/A                                                                                   |
+| `strategy`                                                                            | [PasskeyVerificationStrategy](../../models/components/PasskeyVerificationStrategy.md) | :heavy_check_mark:                                                                    | N/A                                                                                   |
+| `nonce`                                                                               | [Optional<VerificationNonce>](../../models/components/VerificationNonce.md)           | :heavy_minus_sign:                                                                    | N/A                                                                                   |
+| `attempts`                                                                            | *JsonNullable<Long>*                                                                  | :heavy_minus_sign:                                                                    | N/A                                                                                   |
+| `expireAt`                                                                            | *JsonNullable<Long>*                                                                  | :heavy_minus_sign:                                                                    | N/A                                                                                   |
\ No newline at end of file
diff --git a/docs/models/components/PhoneNumber.md b/docs/models/components/PhoneNumber.md
index b7607c6..42f2bc3 100644
--- a/docs/models/components/PhoneNumber.md
+++ b/docs/models/components/PhoneNumber.md
@@ -3,16 +3,16 @@
 
 ## Fields
 
-| Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
-| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `id`                                                                                                                                      | *Optional<? extends String>*                                                                                                              | :heavy_minus_sign:                                                                                                                        | N/A                                                                                                                                       |
-| `object`                                                                                                                                  | [com.clerk.backend_api.models.components.PhoneNumberObject](../../models/components/PhoneNumberObject.md)                                 | :heavy_check_mark:                                                                                                                        | String representing the object's type. Objects of the same type share the same value.<br/>                                                |
-| `phoneNumber`                                                                                                                             | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | N/A                                                                                                                                       |
-| `reservedForSecondFactor`                                                                                                                 | *Optional<? extends Boolean>*                                                                                                             | :heavy_minus_sign:                                                                                                                        | N/A                                                                                                                                       |
-| `defaultSecondFactor`                                                                                                                     | *Optional<? extends Boolean>*                                                                                                             | :heavy_minus_sign:                                                                                                                        | N/A                                                                                                                                       |
-| `reserved`                                                                                                                                | *boolean*                                                                                                                                 | :heavy_check_mark:                                                                                                                        | N/A                                                                                                                                       |
-| `verification`                                                                                                                            | [Optional<? extends com.clerk.backend_api.models.components.PhoneNumberVerification>](../../models/components/PhoneNumberVerification.md) | :heavy_check_mark:                                                                                                                        | N/A                                                                                                                                       |
-| `linkedTo`                                                                                                                                | List<[com.clerk.backend_api.models.components.IdentificationLink](../../models/components/IdentificationLink.md)>                         | :heavy_check_mark:                                                                                                                        | N/A                                                                                                                                       |
-| `backupCodes`                                                                                                                             | List<*String*>                                                                                                                            | :heavy_minus_sign:                                                                                                                        | N/A                                                                                                                                       |
-| `createdAt`                                                                                                                               | *long*                                                                                                                                    | :heavy_check_mark:                                                                                                                        | Unix timestamp of creation<br/>                                                                                                           |
-| `updatedAt`                                                                                                                               | *long*                                                                                                                                    | :heavy_check_mark:                                                                                                                        | Unix timestamp of creation<br/>                                                                                                           |
\ No newline at end of file
+| Field                                                                                   | Type                                                                                    | Required                                                                                | Description                                                                             |
+| --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
+| `id`                                                                                    | *Optional<String>*                                                                      | :heavy_minus_sign:                                                                      | N/A                                                                                     |
+| `object`                                                                                | [PhoneNumberObject](../../models/components/PhoneNumberObject.md)                       | :heavy_check_mark:                                                                      | String representing the object's type. Objects of the same type share the same value.<br/> |
+| `phoneNumber`                                                                           | *String*                                                                                | :heavy_check_mark:                                                                      | N/A                                                                                     |
+| `reservedForSecondFactor`                                                               | *Optional<Boolean>*                                                                     | :heavy_minus_sign:                                                                      | N/A                                                                                     |
+| `defaultSecondFactor`                                                                   | *Optional<Boolean>*                                                                     | :heavy_minus_sign:                                                                      | N/A                                                                                     |
+| `reserved`                                                                              | *boolean*                                                                               | :heavy_check_mark:                                                                      | N/A                                                                                     |
+| `verification`                                                                          | [Optional<PhoneNumberVerification>](../../models/components/PhoneNumberVerification.md) | :heavy_check_mark:                                                                      | N/A                                                                                     |
+| `linkedTo`                                                                              | List<[IdentificationLink](../../models/components/IdentificationLink.md)>               | :heavy_check_mark:                                                                      | N/A                                                                                     |
+| `backupCodes`                                                                           | List<*String*>                                                                          | :heavy_minus_sign:                                                                      | N/A                                                                                     |
+| `createdAt`                                                                             | *long*                                                                                  | :heavy_check_mark:                                                                      | Unix timestamp of creation<br/>                                                         |
+| `updatedAt`                                                                             | *long*                                                                                  | :heavy_check_mark:                                                                      | Unix timestamp of creation<br/>                                                         |
\ No newline at end of file
diff --git a/docs/models/components/ProxyCheck.md b/docs/models/components/ProxyCheck.md
index 2eeea81..852af45 100644
--- a/docs/models/components/ProxyCheck.md
+++ b/docs/models/components/ProxyCheck.md
@@ -3,13 +3,13 @@
 
 ## Fields
 
-| Field                                                                                                   | Type                                                                                                    | Required                                                                                                | Description                                                                                             |
-| ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                | [com.clerk.backend_api.models.components.ProxyCheckObject](../../models/components/ProxyCheckObject.md) | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
-| `id`                                                                                                    | *String*                                                                                                | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
-| `domainId`                                                                                              | *String*                                                                                                | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
-| `lastRunAt`                                                                                             | *long*                                                                                                  | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
-| `proxyUrl`                                                                                              | *String*                                                                                                | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
-| `successful`                                                                                            | *boolean*                                                                                               | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
-| `createdAt`                                                                                             | *long*                                                                                                  | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
-| `updatedAt`                                                                                             | *long*                                                                                                  | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
\ No newline at end of file
+| Field                                                           | Type                                                            | Required                                                        | Description                                                     |
+| --------------------------------------------------------------- | --------------------------------------------------------------- | --------------------------------------------------------------- | --------------------------------------------------------------- |
+| `object`                                                        | [ProxyCheckObject](../../models/components/ProxyCheckObject.md) | :heavy_check_mark:                                              | N/A                                                             |
+| `id`                                                            | *String*                                                        | :heavy_check_mark:                                              | N/A                                                             |
+| `domainId`                                                      | *String*                                                        | :heavy_check_mark:                                              | N/A                                                             |
+| `lastRunAt`                                                     | *long*                                                          | :heavy_check_mark:                                              | N/A                                                             |
+| `proxyUrl`                                                      | *String*                                                        | :heavy_check_mark:                                              | N/A                                                             |
+| `successful`                                                    | *boolean*                                                       | :heavy_check_mark:                                              | N/A                                                             |
+| `createdAt`                                                     | *long*                                                          | :heavy_check_mark:                                              | N/A                                                             |
+| `updatedAt`                                                     | *long*                                                          | :heavy_check_mark:                                              | N/A                                                             |
\ No newline at end of file
diff --git a/docs/models/components/PublicUserData.md b/docs/models/components/PublicUserData.md
index a6bcdea..d51504b 100644
--- a/docs/models/components/PublicUserData.md
+++ b/docs/models/components/PublicUserData.md
@@ -5,10 +5,10 @@
 
 | Field                                                                                                                   | Type                                                                                                                    | Required                                                                                                                | Description                                                                                                             |
 | ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- |
-| `userId`                                                                                                                | *Optional<? extends String>*                                                                                            | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
-| `firstName`                                                                                                             | *JsonNullable<? extends String>*                                                                                        | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
-| `lastName`                                                                                                              | *JsonNullable<? extends String>*                                                                                        | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
-| ~~`profileImageUrl`~~                                                                                                   | *JsonNullable<? extends String>*                                                                                        | :heavy_minus_sign:                                                                                                      | : warning: ** DEPRECATED **: This will be removed in a future release, please migrate away from it as soon as possible. |
-| `imageUrl`                                                                                                              | *Optional<? extends String>*                                                                                            | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
-| `hasImage`                                                                                                              | *Optional<? extends Boolean>*                                                                                           | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
-| `identifier`                                                                                                            | *JsonNullable<? extends String>*                                                                                        | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
\ No newline at end of file
+| `userId`                                                                                                                | *Optional<String>*                                                                                                      | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
+| `firstName`                                                                                                             | *JsonNullable<String>*                                                                                                  | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
+| `lastName`                                                                                                              | *JsonNullable<String>*                                                                                                  | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
+| ~~`profileImageUrl`~~                                                                                                   | *JsonNullable<String>*                                                                                                  | :heavy_minus_sign:                                                                                                      | : warning: ** DEPRECATED **: This will be removed in a future release, please migrate away from it as soon as possible. |
+| `imageUrl`                                                                                                              | *Optional<String>*                                                                                                      | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
+| `hasImage`                                                                                                              | *Optional<Boolean>*                                                                                                     | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
+| `identifier`                                                                                                            | *JsonNullable<String>*                                                                                                  | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
\ No newline at end of file
diff --git a/docs/models/components/RedirectURL.md b/docs/models/components/RedirectURL.md
index 76b2cfd..4a9782e 100644
--- a/docs/models/components/RedirectURL.md
+++ b/docs/models/components/RedirectURL.md
@@ -3,10 +3,10 @@
 
 ## Fields
 
-| Field                                                                                                     | Type                                                                                                      | Required                                                                                                  | Description                                                                                               |
-| --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                  | [com.clerk.backend_api.models.components.RedirectURLObject](../../models/components/RedirectURLObject.md) | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `id`                                                                                                      | *String*                                                                                                  | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `url`                                                                                                     | *String*                                                                                                  | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `createdAt`                                                                                               | *long*                                                                                                    | :heavy_check_mark:                                                                                        | Unix timestamp of creation.<br/>                                                                          |
-| `updatedAt`                                                                                               | *long*                                                                                                    | :heavy_check_mark:                                                                                        | Unix timestamp of last update.<br/>                                                                       |
\ No newline at end of file
+| Field                                                             | Type                                                              | Required                                                          | Description                                                       |
+| ----------------------------------------------------------------- | ----------------------------------------------------------------- | ----------------------------------------------------------------- | ----------------------------------------------------------------- |
+| `object`                                                          | [RedirectURLObject](../../models/components/RedirectURLObject.md) | :heavy_check_mark:                                                | N/A                                                               |
+| `id`                                                              | *String*                                                          | :heavy_check_mark:                                                | N/A                                                               |
+| `url`                                                             | *String*                                                          | :heavy_check_mark:                                                | N/A                                                               |
+| `createdAt`                                                       | *long*                                                            | :heavy_check_mark:                                                | Unix timestamp of creation.<br/>                                  |
+| `updatedAt`                                                       | *long*                                                            | :heavy_check_mark:                                                | Unix timestamp of last update.<br/>                               |
\ No newline at end of file
diff --git a/docs/models/components/SAMLAccount.md b/docs/models/components/SAMLAccount.md
index 7b79076..e69579f 100644
--- a/docs/models/components/SAMLAccount.md
+++ b/docs/models/components/SAMLAccount.md
@@ -3,15 +3,15 @@
 
 ## Fields
 
-| Field                                                                                                                                         | Type                                                                                                                                          | Required                                                                                                                                      | Description                                                                                                                                   |
-| --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| `id`                                                                                                                                          | *String*                                                                                                                                      | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
-| `object`                                                                                                                                      | [com.clerk.backend_api.models.components.SAMLAccountObject](../../models/components/SAMLAccountObject.md)                                     | :heavy_check_mark:                                                                                                                            | String representing the object's type. Objects of the same type share the same value.<br/>                                                    |
-| `provider`                                                                                                                                    | *String*                                                                                                                                      | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
-| `active`                                                                                                                                      | *boolean*                                                                                                                                     | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
-| `emailAddress`                                                                                                                                | *String*                                                                                                                                      | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
-| `firstName`                                                                                                                                   | *JsonNullable<? extends String>*                                                                                                              | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
-| `lastName`                                                                                                                                    | *JsonNullable<? extends String>*                                                                                                              | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
-| `providerUserId`                                                                                                                              | *JsonNullable<? extends String>*                                                                                                              | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
-| `publicMetadata`                                                                                                                              | [Optional<? extends com.clerk.backend_api.models.components.SAMLAccountPublicMetadata>](../../models/components/SAMLAccountPublicMetadata.md) | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
-| `verification`                                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.SAMLAccountVerification>](../../models/components/SAMLAccountVerification.md)     | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
\ No newline at end of file
+| Field                                                                                       | Type                                                                                        | Required                                                                                    | Description                                                                                 |
+| ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
+| `id`                                                                                        | *String*                                                                                    | :heavy_check_mark:                                                                          | N/A                                                                                         |
+| `object`                                                                                    | [SAMLAccountObject](../../models/components/SAMLAccountObject.md)                           | :heavy_check_mark:                                                                          | String representing the object's type. Objects of the same type share the same value.<br/>  |
+| `provider`                                                                                  | *String*                                                                                    | :heavy_check_mark:                                                                          | N/A                                                                                         |
+| `active`                                                                                    | *boolean*                                                                                   | :heavy_check_mark:                                                                          | N/A                                                                                         |
+| `emailAddress`                                                                              | *String*                                                                                    | :heavy_check_mark:                                                                          | N/A                                                                                         |
+| `firstName`                                                                                 | *JsonNullable<String>*                                                                      | :heavy_minus_sign:                                                                          | N/A                                                                                         |
+| `lastName`                                                                                  | *JsonNullable<String>*                                                                      | :heavy_minus_sign:                                                                          | N/A                                                                                         |
+| `providerUserId`                                                                            | *JsonNullable<String>*                                                                      | :heavy_minus_sign:                                                                          | N/A                                                                                         |
+| `publicMetadata`                                                                            | [Optional<SAMLAccountPublicMetadata>](../../models/components/SAMLAccountPublicMetadata.md) | :heavy_minus_sign:                                                                          | N/A                                                                                         |
+| `verification`                                                                              | [Optional<SAMLAccountVerification>](../../models/components/SAMLAccountVerification.md)     | :heavy_check_mark:                                                                          | N/A                                                                                         |
\ No newline at end of file
diff --git a/docs/models/components/SAMLConnection.md b/docs/models/components/SAMLConnection.md
index f9b81aa..e155a68 100644
--- a/docs/models/components/SAMLConnection.md
+++ b/docs/models/components/SAMLConnection.md
@@ -3,26 +3,26 @@
 
 ## Fields
 
-| Field                                                                                                                       | Type                                                                                                                        | Required                                                                                                                    | Description                                                                                                                 |
-| --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                                    | [com.clerk.backend_api.models.components.SAMLConnectionObject](../../models/components/SAMLConnectionObject.md)             | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `id`                                                                                                                        | *String*                                                                                                                    | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `name`                                                                                                                      | *String*                                                                                                                    | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `domain`                                                                                                                    | *String*                                                                                                                    | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `idpEntityId`                                                                                                               | *Optional<? extends String>*                                                                                                | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `idpSsoUrl`                                                                                                                 | *Optional<? extends String>*                                                                                                | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `idpCertificate`                                                                                                            | *Optional<? extends String>*                                                                                                | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `idpMetadataUrl`                                                                                                            | *JsonNullable<? extends String>*                                                                                            | :heavy_minus_sign:                                                                                                          | N/A                                                                                                                         |
-| `idpMetadata`                                                                                                               | *JsonNullable<? extends String>*                                                                                            | :heavy_minus_sign:                                                                                                          | N/A                                                                                                                         |
-| `acsUrl`                                                                                                                    | *String*                                                                                                                    | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `spEntityId`                                                                                                                | *String*                                                                                                                    | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `spMetadataUrl`                                                                                                             | *String*                                                                                                                    | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `attributeMapping`                                                                                                          | [Optional<? extends com.clerk.backend_api.models.components.AttributeMapping>](../../models/components/AttributeMapping.md) | :heavy_minus_sign:                                                                                                          | N/A                                                                                                                         |
-| `active`                                                                                                                    | *boolean*                                                                                                                   | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `provider`                                                                                                                  | *String*                                                                                                                    | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `userCount`                                                                                                                 | *long*                                                                                                                      | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `syncUserAttributes`                                                                                                        | *boolean*                                                                                                                   | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `allowSubdomains`                                                                                                           | *Optional<? extends Boolean>*                                                                                               | :heavy_minus_sign:                                                                                                          | N/A                                                                                                                         |
-| `allowIdpInitiated`                                                                                                         | *Optional<? extends Boolean>*                                                                                               | :heavy_minus_sign:                                                                                                          | N/A                                                                                                                         |
-| `createdAt`                                                                                                                 | *long*                                                                                                                      | :heavy_check_mark:                                                                                                          | Unix timestamp of creation.<br/>                                                                                            |
-| `updatedAt`                                                                                                                 | *long*                                                                                                                      | :heavy_check_mark:                                                                                                          | Unix timestamp of last update.<br/>                                                                                         |
\ No newline at end of file
+| Field                                                                     | Type                                                                      | Required                                                                  | Description                                                               |
+| ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- |
+| `object`                                                                  | [SAMLConnectionObject](../../models/components/SAMLConnectionObject.md)   | :heavy_check_mark:                                                        | N/A                                                                       |
+| `id`                                                                      | *String*                                                                  | :heavy_check_mark:                                                        | N/A                                                                       |
+| `name`                                                                    | *String*                                                                  | :heavy_check_mark:                                                        | N/A                                                                       |
+| `domain`                                                                  | *String*                                                                  | :heavy_check_mark:                                                        | N/A                                                                       |
+| `idpEntityId`                                                             | *Optional<String>*                                                        | :heavy_check_mark:                                                        | N/A                                                                       |
+| `idpSsoUrl`                                                               | *Optional<String>*                                                        | :heavy_check_mark:                                                        | N/A                                                                       |
+| `idpCertificate`                                                          | *Optional<String>*                                                        | :heavy_check_mark:                                                        | N/A                                                                       |
+| `idpMetadataUrl`                                                          | *JsonNullable<String>*                                                    | :heavy_minus_sign:                                                        | N/A                                                                       |
+| `idpMetadata`                                                             | *JsonNullable<String>*                                                    | :heavy_minus_sign:                                                        | N/A                                                                       |
+| `acsUrl`                                                                  | *String*                                                                  | :heavy_check_mark:                                                        | N/A                                                                       |
+| `spEntityId`                                                              | *String*                                                                  | :heavy_check_mark:                                                        | N/A                                                                       |
+| `spMetadataUrl`                                                           | *String*                                                                  | :heavy_check_mark:                                                        | N/A                                                                       |
+| `attributeMapping`                                                        | [Optional<AttributeMapping>](../../models/components/AttributeMapping.md) | :heavy_minus_sign:                                                        | N/A                                                                       |
+| `active`                                                                  | *boolean*                                                                 | :heavy_check_mark:                                                        | N/A                                                                       |
+| `provider`                                                                | *String*                                                                  | :heavy_check_mark:                                                        | N/A                                                                       |
+| `userCount`                                                               | *long*                                                                    | :heavy_check_mark:                                                        | N/A                                                                       |
+| `syncUserAttributes`                                                      | *boolean*                                                                 | :heavy_check_mark:                                                        | N/A                                                                       |
+| `allowSubdomains`                                                         | *Optional<Boolean>*                                                       | :heavy_minus_sign:                                                        | N/A                                                                       |
+| `allowIdpInitiated`                                                       | *Optional<Boolean>*                                                       | :heavy_minus_sign:                                                        | N/A                                                                       |
+| `createdAt`                                                               | *long*                                                                    | :heavy_check_mark:                                                        | Unix timestamp of creation.<br/>                                          |
+| `updatedAt`                                                               | *long*                                                                    | :heavy_check_mark:                                                        | Unix timestamp of last update.<br/>                                       |
\ No newline at end of file
diff --git a/docs/models/components/SAMLConnections.md b/docs/models/components/SAMLConnections.md
index 33a829a..18f5039 100644
--- a/docs/models/components/SAMLConnections.md
+++ b/docs/models/components/SAMLConnections.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                     | Type                                                                                                      | Required                                                                                                  | Description                                                                                               |
-| --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
-| `data`                                                                                                    | List<[com.clerk.backend_api.models.components.SAMLConnection](../../models/components/SAMLConnection.md)> | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `totalCount`                                                                                              | *long*                                                                                                    | :heavy_check_mark:                                                                                        | Total number of SAML Connections<br/>                                                                     |
\ No newline at end of file
+| Field                                                             | Type                                                              | Required                                                          | Description                                                       |
+| ----------------------------------------------------------------- | ----------------------------------------------------------------- | ----------------------------------------------------------------- | ----------------------------------------------------------------- |
+| `data`                                                            | List<[SAMLConnection](../../models/components/SAMLConnection.md)> | :heavy_check_mark:                                                | N/A                                                               |
+| `totalCount`                                                      | *long*                                                            | :heavy_check_mark:                                                | Total number of SAML Connections<br/>                             |
\ No newline at end of file
diff --git a/docs/models/components/SAMLErrorClerkError.md b/docs/models/components/SAMLErrorClerkError.md
index 242bc51..3656831 100644
--- a/docs/models/components/SAMLErrorClerkError.md
+++ b/docs/models/components/SAMLErrorClerkError.md
@@ -3,10 +3,10 @@
 
 ## Fields
 
-| Field                                                                                                                             | Type                                                                                                                              | Required                                                                                                                          | Description                                                                                                                       |
-| --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| `message`                                                                                                                         | *String*                                                                                                                          | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
-| `longMessage`                                                                                                                     | *String*                                                                                                                          | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
-| `code`                                                                                                                            | *String*                                                                                                                          | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
-| `meta`                                                                                                                            | [Optional<? extends com.clerk.backend_api.models.components.ClerkErrorErrorMeta>](../../models/components/ClerkErrorErrorMeta.md) | :heavy_minus_sign:                                                                                                                | N/A                                                                                                                               |
-| `clerkTraceId`                                                                                                                    | *Optional<? extends String>*                                                                                                      | :heavy_minus_sign:                                                                                                                | N/A                                                                                                                               |
\ No newline at end of file
+| Field                                                                           | Type                                                                            | Required                                                                        | Description                                                                     |
+| ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- |
+| `message`                                                                       | *String*                                                                        | :heavy_check_mark:                                                              | N/A                                                                             |
+| `longMessage`                                                                   | *String*                                                                        | :heavy_check_mark:                                                              | N/A                                                                             |
+| `code`                                                                          | *String*                                                                        | :heavy_check_mark:                                                              | N/A                                                                             |
+| `meta`                                                                          | [Optional<ClerkErrorErrorMeta>](../../models/components/ClerkErrorErrorMeta.md) | :heavy_minus_sign:                                                              | N/A                                                                             |
+| `clerkTraceId`                                                                  | *Optional<String>*                                                              | :heavy_minus_sign:                                                              | N/A                                                                             |
\ No newline at end of file
diff --git a/docs/models/components/Saml.md b/docs/models/components/Saml.md
index 4ba661e..25d7775 100644
--- a/docs/models/components/Saml.md
+++ b/docs/models/components/Saml.md
@@ -3,11 +3,11 @@
 
 ## Fields
 
-| Field                                                                                                                             | Type                                                                                                                              | Required                                                                                                                          | Description                                                                                                                       |
-| --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| `status`                                                                                                                          | [com.clerk.backend_api.models.components.SAMLVerificationStatus](../../models/components/SAMLVerificationStatus.md)               | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
-| `strategy`                                                                                                                        | [com.clerk.backend_api.models.components.SAMLVerificationStrategy](../../models/components/SAMLVerificationStrategy.md)           | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
-| `externalVerificationRedirectUrl`                                                                                                 | *Optional<? extends String>*                                                                                                      | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
-| `error`                                                                                                                           | [JsonNullable<? extends com.clerk.backend_api.models.components.VerificationError>](../../models/components/VerificationError.md) | :heavy_minus_sign:                                                                                                                | N/A                                                                                                                               |
-| `expireAt`                                                                                                                        | *long*                                                                                                                            | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
-| `attempts`                                                                                                                        | *JsonNullable<? extends Long>*                                                                                                    | :heavy_minus_sign:                                                                                                                | N/A                                                                                                                               |
\ No newline at end of file
+| Field                                                                           | Type                                                                            | Required                                                                        | Description                                                                     |
+| ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- |
+| `status`                                                                        | [SAMLVerificationStatus](../../models/components/SAMLVerificationStatus.md)     | :heavy_check_mark:                                                              | N/A                                                                             |
+| `strategy`                                                                      | [SAMLVerificationStrategy](../../models/components/SAMLVerificationStrategy.md) | :heavy_check_mark:                                                              | N/A                                                                             |
+| `externalVerificationRedirectUrl`                                               | *Optional<String>*                                                              | :heavy_check_mark:                                                              | N/A                                                                             |
+| `error`                                                                         | [JsonNullable<VerificationError>](../../models/components/VerificationError.md) | :heavy_minus_sign:                                                              | N/A                                                                             |
+| `expireAt`                                                                      | *long*                                                                          | :heavy_check_mark:                                                              | N/A                                                                             |
+| `attempts`                                                                      | *JsonNullable<Long>*                                                            | :heavy_minus_sign:                                                              | N/A                                                                             |
\ No newline at end of file
diff --git a/docs/models/components/SchemasPasskey.md b/docs/models/components/SchemasPasskey.md
index dd3a42d..d46c600 100644
--- a/docs/models/components/SchemasPasskey.md
+++ b/docs/models/components/SchemasPasskey.md
@@ -3,10 +3,10 @@
 
 ## Fields
 
-| Field                                                                                                                                           | Type                                                                                                                                            | Required                                                                                                                                        | Description                                                                                                                                     |
-| ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
-| `id`                                                                                                                                            | *Optional<? extends String>*                                                                                                                    | :heavy_minus_sign:                                                                                                                              | N/A                                                                                                                                             |
-| `object`                                                                                                                                        | [com.clerk.backend_api.models.components.SchemasPasskeyObject](../../models/components/SchemasPasskeyObject.md)                                 | :heavy_check_mark:                                                                                                                              | String representing the object's type. Objects of the same type share the same value.<br/>                                                      |
-| `name`                                                                                                                                          | *String*                                                                                                                                        | :heavy_check_mark:                                                                                                                              | N/A                                                                                                                                             |
-| `lastUsedAt`                                                                                                                                    | *long*                                                                                                                                          | :heavy_check_mark:                                                                                                                              | Unix timestamp of when the passkey was last used.<br/>                                                                                          |
-| `verification`                                                                                                                                  | [Optional<? extends com.clerk.backend_api.models.components.SchemasPasskeyVerification>](../../models/components/SchemasPasskeyVerification.md) | :heavy_check_mark:                                                                                                                              | N/A                                                                                                                                             |
\ No newline at end of file
+| Field                                                                                         | Type                                                                                          | Required                                                                                      | Description                                                                                   |
+| --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- |
+| `id`                                                                                          | *Optional<String>*                                                                            | :heavy_minus_sign:                                                                            | N/A                                                                                           |
+| `object`                                                                                      | [SchemasPasskeyObject](../../models/components/SchemasPasskeyObject.md)                       | :heavy_check_mark:                                                                            | String representing the object's type. Objects of the same type share the same value.<br/>    |
+| `name`                                                                                        | *String*                                                                                      | :heavy_check_mark:                                                                            | N/A                                                                                           |
+| `lastUsedAt`                                                                                  | *long*                                                                                        | :heavy_check_mark:                                                                            | Unix timestamp of when the passkey was last used.<br/>                                        |
+| `verification`                                                                                | [Optional<SchemasPasskeyVerification>](../../models/components/SchemasPasskeyVerification.md) | :heavy_check_mark:                                                                            | N/A                                                                                           |
\ No newline at end of file
diff --git a/docs/models/components/Security.md b/docs/models/components/Security.md
index 494b03f..4934713 100644
--- a/docs/models/components/Security.md
+++ b/docs/models/components/Security.md
@@ -3,6 +3,6 @@
 
 ## Fields
 
-| Field                        | Type                         | Required                     | Description                  |
-| ---------------------------- | ---------------------------- | ---------------------------- | ---------------------------- |
-| `bearerAuth`                 | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
\ No newline at end of file
+| Field              | Type               | Required           | Description        |
+| ------------------ | ------------------ | ------------------ | ------------------ |
+| `bearerAuth`       | *Optional<String>* | :heavy_minus_sign: | N/A                |
\ No newline at end of file
diff --git a/docs/models/components/Session.md b/docs/models/components/Session.md
index 3d4e989..17e351a 100644
--- a/docs/models/components/Session.md
+++ b/docs/models/components/Session.md
@@ -3,17 +3,17 @@
 
 ## Fields
 
-| Field                                                                                                     | Type                                                                                                      | Required                                                                                                  | Description                                                                                               |
-| --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                  | [com.clerk.backend_api.models.components.SessionObject](../../models/components/SessionObject.md)         | :heavy_check_mark:                                                                                        | String representing the object's type. Objects of the same type share the same value.<br/>                |
-| `id`                                                                                                      | *String*                                                                                                  | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `userId`                                                                                                  | *String*                                                                                                  | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `clientId`                                                                                                | *String*                                                                                                  | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `actor`                                                                                                   | [JsonNullable<? extends com.clerk.backend_api.models.components.Actor>](../../models/components/Actor.md) | :heavy_minus_sign:                                                                                        | N/A                                                                                                       |
-| `status`                                                                                                  | [com.clerk.backend_api.models.components.Status](../../models/components/Status.md)                       | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `lastActiveOrganizationId`                                                                                | *JsonNullable<? extends String>*                                                                          | :heavy_minus_sign:                                                                                        | N/A                                                                                                       |
-| `lastActiveAt`                                                                                            | *long*                                                                                                    | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `expireAt`                                                                                                | *long*                                                                                                    | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `abandonAt`                                                                                               | *long*                                                                                                    | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `updatedAt`                                                                                               | *long*                                                                                                    | :heavy_check_mark:                                                                                        | Unix timestamp of last update.<br/>                                                                       |
-| `createdAt`                                                                                               | *long*                                                                                                    | :heavy_check_mark:                                                                                        | Unix timestamp of creation.<br/>                                                                          |
\ No newline at end of file
+| Field                                                                                  | Type                                                                                   | Required                                                                               | Description                                                                            |
+| -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- |
+| `object`                                                                               | [SessionObject](../../models/components/SessionObject.md)                              | :heavy_check_mark:                                                                     | String representing the object's type. Objects of the same type share the same value.<br/> |
+| `id`                                                                                   | *String*                                                                               | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `userId`                                                                               | *String*                                                                               | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `clientId`                                                                             | *String*                                                                               | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `actor`                                                                                | [JsonNullable<Actor>](../../models/components/Actor.md)                                | :heavy_minus_sign:                                                                     | N/A                                                                                    |
+| `status`                                                                               | [Status](../../models/components/Status.md)                                            | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `lastActiveOrganizationId`                                                             | *JsonNullable<String>*                                                                 | :heavy_minus_sign:                                                                     | N/A                                                                                    |
+| `lastActiveAt`                                                                         | *long*                                                                                 | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `expireAt`                                                                             | *long*                                                                                 | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `abandonAt`                                                                            | *long*                                                                                 | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `updatedAt`                                                                            | *long*                                                                                 | :heavy_check_mark:                                                                     | Unix timestamp of last update.<br/>                                                    |
+| `createdAt`                                                                            | *long*                                                                                 | :heavy_check_mark:                                                                     | Unix timestamp of creation.<br/>                                                       |
\ No newline at end of file
diff --git a/docs/models/components/SignInToken.md b/docs/models/components/SignInToken.md
index 537232f..fc26b4b 100644
--- a/docs/models/components/SignInToken.md
+++ b/docs/models/components/SignInToken.md
@@ -3,13 +3,13 @@
 
 ## Fields
 
-| Field                                                                                                     | Type                                                                                                      | Required                                                                                                  | Description                                                                                               |
-| --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                  | [com.clerk.backend_api.models.components.SignInTokenObject](../../models/components/SignInTokenObject.md) | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `id`                                                                                                      | *String*                                                                                                  | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `status`                                                                                                  | [com.clerk.backend_api.models.components.SignInTokenStatus](../../models/components/SignInTokenStatus.md) | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `userId`                                                                                                  | *String*                                                                                                  | :heavy_check_mark:                                                                                        | N/A                                                                                                       |
-| `token`                                                                                                   | *Optional<? extends String>*                                                                              | :heavy_minus_sign:                                                                                        | N/A                                                                                                       |
-| `url`                                                                                                     | *JsonNullable<? extends String>*                                                                          | :heavy_minus_sign:                                                                                        | N/A                                                                                                       |
-| `createdAt`                                                                                               | *long*                                                                                                    | :heavy_check_mark:                                                                                        | Unix timestamp of creation.<br/>                                                                          |
-| `updatedAt`                                                                                               | *long*                                                                                                    | :heavy_check_mark:                                                                                        | Unix timestamp of last update.<br/>                                                                       |
\ No newline at end of file
+| Field                                                             | Type                                                              | Required                                                          | Description                                                       |
+| ----------------------------------------------------------------- | ----------------------------------------------------------------- | ----------------------------------------------------------------- | ----------------------------------------------------------------- |
+| `object`                                                          | [SignInTokenObject](../../models/components/SignInTokenObject.md) | :heavy_check_mark:                                                | N/A                                                               |
+| `id`                                                              | *String*                                                          | :heavy_check_mark:                                                | N/A                                                               |
+| `status`                                                          | [SignInTokenStatus](../../models/components/SignInTokenStatus.md) | :heavy_check_mark:                                                | N/A                                                               |
+| `userId`                                                          | *String*                                                          | :heavy_check_mark:                                                | N/A                                                               |
+| `token`                                                           | *Optional<String>*                                                | :heavy_minus_sign:                                                | N/A                                                               |
+| `url`                                                             | *JsonNullable<String>*                                            | :heavy_minus_sign:                                                | N/A                                                               |
+| `createdAt`                                                       | *long*                                                            | :heavy_check_mark:                                                | Unix timestamp of creation.<br/>                                  |
+| `updatedAt`                                                       | *long*                                                            | :heavy_check_mark:                                                | Unix timestamp of last update.<br/>                               |
\ No newline at end of file
diff --git a/docs/models/components/SignUp.md b/docs/models/components/SignUp.md
index ec3744d..077af0b 100644
--- a/docs/models/components/SignUp.md
+++ b/docs/models/components/SignUp.md
@@ -3,28 +3,28 @@
 
 ## Fields
 
-| Field                                                                                                                               | Type                                                                                                                                | Required                                                                                                                            | Description                                                                                                                         |
-| ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                                            | [com.clerk.backend_api.models.components.SignUpObject](../../models/components/SignUpObject.md)                                     | :heavy_check_mark:                                                                                                                  | N/A                                                                                                                                 |
-| `id`                                                                                                                                | *String*                                                                                                                            | :heavy_check_mark:                                                                                                                  | N/A                                                                                                                                 |
-| `status`                                                                                                                            | [com.clerk.backend_api.models.components.SignUpStatus](../../models/components/SignUpStatus.md)                                     | :heavy_check_mark:                                                                                                                  | N/A                                                                                                                                 |
-| `requiredFields`                                                                                                                    | List<*String*>                                                                                                                      | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `optionalFields`                                                                                                                    | List<*String*>                                                                                                                      | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `missingFields`                                                                                                                     | List<*String*>                                                                                                                      | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `unverifiedFields`                                                                                                                  | List<*String*>                                                                                                                      | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `verifications`                                                                                                                     | [Optional<? extends com.clerk.backend_api.models.components.Verifications>](../../models/components/Verifications.md)               | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `username`                                                                                                                          | *JsonNullable<? extends String>*                                                                                                    | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `emailAddress`                                                                                                                      | *JsonNullable<? extends String>*                                                                                                    | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `phoneNumber`                                                                                                                       | *JsonNullable<? extends String>*                                                                                                    | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `web3Wallet`                                                                                                                        | *JsonNullable<? extends String>*                                                                                                    | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `passwordEnabled`                                                                                                                   | *boolean*                                                                                                                           | :heavy_check_mark:                                                                                                                  | N/A                                                                                                                                 |
-| `firstName`                                                                                                                         | *JsonNullable<? extends String>*                                                                                                    | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `lastName`                                                                                                                          | *JsonNullable<? extends String>*                                                                                                    | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `unsafeMetadata`                                                                                                                    | [Optional<? extends com.clerk.backend_api.models.components.SignUpUnsafeMetadata>](../../models/components/SignUpUnsafeMetadata.md) | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `publicMetadata`                                                                                                                    | [Optional<? extends com.clerk.backend_api.models.components.SignUpPublicMetadata>](../../models/components/SignUpPublicMetadata.md) | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `customAction`                                                                                                                      | *boolean*                                                                                                                           | :heavy_check_mark:                                                                                                                  | N/A                                                                                                                                 |
-| `externalId`                                                                                                                        | *JsonNullable<? extends String>*                                                                                                    | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `createdSessionId`                                                                                                                  | *JsonNullable<? extends String>*                                                                                                    | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `createdUserId`                                                                                                                     | *JsonNullable<? extends String>*                                                                                                    | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
-| `abandonAt`                                                                                                                         | *long*                                                                                                                              | :heavy_check_mark:                                                                                                                  | N/A                                                                                                                                 |
-| `externalAccount`                                                                                                                   | [Optional<? extends com.clerk.backend_api.models.components.ExternalAccount>](../../models/components/ExternalAccount.md)           | :heavy_minus_sign:                                                                                                                  | N/A                                                                                                                                 |
\ No newline at end of file
+| Field                                                                             | Type                                                                              | Required                                                                          | Description                                                                       |
+| --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- |
+| `object`                                                                          | [SignUpObject](../../models/components/SignUpObject.md)                           | :heavy_check_mark:                                                                | N/A                                                                               |
+| `id`                                                                              | *String*                                                                          | :heavy_check_mark:                                                                | N/A                                                                               |
+| `status`                                                                          | [SignUpStatus](../../models/components/SignUpStatus.md)                           | :heavy_check_mark:                                                                | N/A                                                                               |
+| `requiredFields`                                                                  | List<*String*>                                                                    | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `optionalFields`                                                                  | List<*String*>                                                                    | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `missingFields`                                                                   | List<*String*>                                                                    | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `unverifiedFields`                                                                | List<*String*>                                                                    | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `verifications`                                                                   | [Optional<Verifications>](../../models/components/Verifications.md)               | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `username`                                                                        | *JsonNullable<String>*                                                            | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `emailAddress`                                                                    | *JsonNullable<String>*                                                            | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `phoneNumber`                                                                     | *JsonNullable<String>*                                                            | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `web3Wallet`                                                                      | *JsonNullable<String>*                                                            | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `passwordEnabled`                                                                 | *boolean*                                                                         | :heavy_check_mark:                                                                | N/A                                                                               |
+| `firstName`                                                                       | *JsonNullable<String>*                                                            | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `lastName`                                                                        | *JsonNullable<String>*                                                            | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `unsafeMetadata`                                                                  | [Optional<SignUpUnsafeMetadata>](../../models/components/SignUpUnsafeMetadata.md) | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `publicMetadata`                                                                  | [Optional<SignUpPublicMetadata>](../../models/components/SignUpPublicMetadata.md) | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `customAction`                                                                    | *boolean*                                                                         | :heavy_check_mark:                                                                | N/A                                                                               |
+| `externalId`                                                                      | *JsonNullable<String>*                                                            | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `createdSessionId`                                                                | *JsonNullable<String>*                                                            | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `createdUserId`                                                                   | *JsonNullable<String>*                                                            | :heavy_minus_sign:                                                                | N/A                                                                               |
+| `abandonAt`                                                                       | *long*                                                                            | :heavy_check_mark:                                                                | N/A                                                                               |
+| `externalAccount`                                                                 | [Optional<ExternalAccount>](../../models/components/ExternalAccount.md)           | :heavy_minus_sign:                                                                | N/A                                                                               |
\ No newline at end of file
diff --git a/docs/models/components/Template.md b/docs/models/components/Template.md
index 9c2a3c6..3b9079d 100644
--- a/docs/models/components/Template.md
+++ b/docs/models/components/Template.md
@@ -3,26 +3,26 @@
 
 ## Fields
 
-| Field                                                                                                                   | Type                                                                                                                    | Required                                                                                                                | Description                                                                                                             |
-| ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- |
-| `id`                                                                                                                    | *Optional<? extends String>*                                                                                            | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
-| `object`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.TemplateObject>](../../models/components/TemplateObject.md) | :heavy_minus_sign:                                                                                                      | String representing the object's type. Objects of the same type share the same value.<br/>                              |
-| `instanceId`                                                                                                            | *JsonNullable<? extends String>*                                                                                        | :heavy_minus_sign:                                                                                                      | the id of the instance the template belongs to                                                                          |
-| `resourceType`                                                                                                          | *Optional<? extends String>*                                                                                            | :heavy_minus_sign:                                                                                                      | whether this is a system (default) or user overridden) template                                                         |
-| `templateType`                                                                                                          | *Optional<? extends String>*                                                                                            | :heavy_minus_sign:                                                                                                      | whether this is an email or SMS template                                                                                |
-| `name`                                                                                                                  | *Optional<? extends String>*                                                                                            | :heavy_minus_sign:                                                                                                      | user-friendly name of the template                                                                                      |
-| `slug`                                                                                                                  | *Optional<? extends String>*                                                                                            | :heavy_minus_sign:                                                                                                      | machine-friendly name of the template                                                                                   |
-| `position`                                                                                                              | *Optional<? extends Long>*                                                                                              | :heavy_minus_sign:                                                                                                      | position with the listing of templates                                                                                  |
-| `canRevert`                                                                                                             | *Optional<? extends Boolean>*                                                                                           | :heavy_minus_sign:                                                                                                      | whether this template can be reverted to the corresponding system default                                               |
-| `canDelete`                                                                                                             | *Optional<? extends Boolean>*                                                                                           | :heavy_minus_sign:                                                                                                      | whether this template can be deleted                                                                                    |
-| `canDisable`                                                                                                            | *Optional<? extends Boolean>*                                                                                           | :heavy_minus_sign:                                                                                                      | whether this template can be disabled, true only for notification SMS templates                                         |
-| `subject`                                                                                                               | *JsonNullable<? extends String>*                                                                                        | :heavy_minus_sign:                                                                                                      | email subject                                                                                                           |
-| `markup`                                                                                                                | *Optional<? extends String>*                                                                                            | :heavy_minus_sign:                                                                                                      | the editor markup used to generate the body of the template                                                             |
-| `body`                                                                                                                  | *Optional<? extends String>*                                                                                            | :heavy_minus_sign:                                                                                                      | the template body before variable interpolation                                                                         |
-| `availableVariables`                                                                                                    | List<*String*>                                                                                                          | :heavy_minus_sign:                                                                                                      | list of variables that are available for use in the template body                                                       |
-| `requiredVariables`                                                                                                     | List<*String*>                                                                                                          | :heavy_minus_sign:                                                                                                      | list of variables that must be contained in the template body                                                           |
-| `fromEmailName`                                                                                                         | *Optional<? extends String>*                                                                                            | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
-| `replyToEmailName`                                                                                                      | *Optional<? extends String>*                                                                                            | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
-| `deliveredByClerk`                                                                                                      | *Optional<? extends Boolean>*                                                                                           | :heavy_minus_sign:                                                                                                      | N/A                                                                                                                     |
-| `updatedAt`                                                                                                             | *Optional<? extends Long>*                                                                                              | :heavy_minus_sign:                                                                                                      | Unix timestamp of last update.<br/>                                                                                     |
-| `createdAt`                                                                                                             | *Optional<? extends Long>*                                                                                              | :heavy_minus_sign:                                                                                                      | Unix timestamp of creation.<br/>                                                                                        |
\ No newline at end of file
+| Field                                                                                  | Type                                                                                   | Required                                                                               | Description                                                                            |
+| -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- |
+| `id`                                                                                   | *Optional<String>*                                                                     | :heavy_minus_sign:                                                                     | N/A                                                                                    |
+| `object`                                                                               | [Optional<TemplateObject>](../../models/components/TemplateObject.md)                  | :heavy_minus_sign:                                                                     | String representing the object's type. Objects of the same type share the same value.<br/> |
+| `instanceId`                                                                           | *JsonNullable<String>*                                                                 | :heavy_minus_sign:                                                                     | the id of the instance the template belongs to                                         |
+| `resourceType`                                                                         | *Optional<String>*                                                                     | :heavy_minus_sign:                                                                     | whether this is a system (default) or user overridden) template                        |
+| `templateType`                                                                         | *Optional<String>*                                                                     | :heavy_minus_sign:                                                                     | whether this is an email or SMS template                                               |
+| `name`                                                                                 | *Optional<String>*                                                                     | :heavy_minus_sign:                                                                     | user-friendly name of the template                                                     |
+| `slug`                                                                                 | *Optional<String>*                                                                     | :heavy_minus_sign:                                                                     | machine-friendly name of the template                                                  |
+| `position`                                                                             | *Optional<Long>*                                                                       | :heavy_minus_sign:                                                                     | position with the listing of templates                                                 |
+| `canRevert`                                                                            | *Optional<Boolean>*                                                                    | :heavy_minus_sign:                                                                     | whether this template can be reverted to the corresponding system default              |
+| `canDelete`                                                                            | *Optional<Boolean>*                                                                    | :heavy_minus_sign:                                                                     | whether this template can be deleted                                                   |
+| `canDisable`                                                                           | *Optional<Boolean>*                                                                    | :heavy_minus_sign:                                                                     | whether this template can be disabled, true only for notification SMS templates        |
+| `subject`                                                                              | *JsonNullable<String>*                                                                 | :heavy_minus_sign:                                                                     | email subject                                                                          |
+| `markup`                                                                               | *Optional<String>*                                                                     | :heavy_minus_sign:                                                                     | the editor markup used to generate the body of the template                            |
+| `body`                                                                                 | *Optional<String>*                                                                     | :heavy_minus_sign:                                                                     | the template body before variable interpolation                                        |
+| `availableVariables`                                                                   | List<*String*>                                                                         | :heavy_minus_sign:                                                                     | list of variables that are available for use in the template body                      |
+| `requiredVariables`                                                                    | List<*String*>                                                                         | :heavy_minus_sign:                                                                     | list of variables that must be contained in the template body                          |
+| `fromEmailName`                                                                        | *Optional<String>*                                                                     | :heavy_minus_sign:                                                                     | N/A                                                                                    |
+| `replyToEmailName`                                                                     | *Optional<String>*                                                                     | :heavy_minus_sign:                                                                     | N/A                                                                                    |
+| `deliveredByClerk`                                                                     | *Optional<Boolean>*                                                                    | :heavy_minus_sign:                                                                     | N/A                                                                                    |
+| `updatedAt`                                                                            | *Optional<Long>*                                                                       | :heavy_minus_sign:                                                                     | Unix timestamp of last update.<br/>                                                    |
+| `createdAt`                                                                            | *Optional<Long>*                                                                       | :heavy_minus_sign:                                                                     | Unix timestamp of creation.<br/>                                                       |
\ No newline at end of file
diff --git a/docs/models/components/TestingToken.md b/docs/models/components/TestingToken.md
index 8fc016e..2d03e5d 100644
--- a/docs/models/components/TestingToken.md
+++ b/docs/models/components/TestingToken.md
@@ -5,6 +5,6 @@
 
 | Field                                                                                                                                | Type                                                                                                                                 | Required                                                                                                                             | Description                                                                                                                          | Example                                                                                                                              |
 | ------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------ |
-| `object`                                                                                                                             | [com.clerk.backend_api.models.components.TestingTokenObject](../../models/components/TestingTokenObject.md)                          | :heavy_check_mark:                                                                                                                   | N/A                                                                                                                                  |                                                                                                                                      |
+| `object`                                                                                                                             | [TestingTokenObject](../../models/components/TestingTokenObject.md)                                                                  | :heavy_check_mark:                                                                                                                   | N/A                                                                                                                                  |                                                                                                                                      |
 | `token`                                                                                                                              | *String*                                                                                                                             | :heavy_check_mark:                                                                                                                   | The actual token. This value is meant to be passed in the `__clerk_testing_token` query parameter with requests to the Frontend API. | 1713877200-c_2J2MvPu9PnXcuhbPZNao0LOXqK9A7YrnBn0HmIWxy                                                                               |
 | `expiresAt`                                                                                                                          | *long*                                                                                                                               | :heavy_check_mark:                                                                                                                   | Unix timestamp of the token's expiration time.<br/>                                                                                  | 1713880800                                                                                                                           |
\ No newline at end of file
diff --git a/docs/models/components/Ticket.md b/docs/models/components/Ticket.md
index d634dd1..5ca25f7 100644
--- a/docs/models/components/Ticket.md
+++ b/docs/models/components/Ticket.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                       | Type                                                                                                                        | Required                                                                                                                    | Description                                                                                                                 |
-| --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
-| `status`                                                                                                                    | [com.clerk.backend_api.models.components.TicketVerificationStatus](../../models/components/TicketVerificationStatus.md)     | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `strategy`                                                                                                                  | [com.clerk.backend_api.models.components.TicketVerificationStrategy](../../models/components/TicketVerificationStrategy.md) | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
-| `attempts`                                                                                                                  | *JsonNullable<? extends Long>*                                                                                              | :heavy_minus_sign:                                                                                                          | N/A                                                                                                                         |
-| `expireAt`                                                                                                                  | *JsonNullable<? extends Long>*                                                                                              | :heavy_minus_sign:                                                                                                          | N/A                                                                                                                         |
\ No newline at end of file
+| Field                                                                               | Type                                                                                | Required                                                                            | Description                                                                         |
+| ----------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- |
+| `status`                                                                            | [TicketVerificationStatus](../../models/components/TicketVerificationStatus.md)     | :heavy_check_mark:                                                                  | N/A                                                                                 |
+| `strategy`                                                                          | [TicketVerificationStrategy](../../models/components/TicketVerificationStrategy.md) | :heavy_check_mark:                                                                  | N/A                                                                                 |
+| `attempts`                                                                          | *JsonNullable<Long>*                                                                | :heavy_minus_sign:                                                                  | N/A                                                                                 |
+| `expireAt`                                                                          | *JsonNullable<Long>*                                                                | :heavy_minus_sign:                                                                  | N/A                                                                                 |
\ No newline at end of file
diff --git a/docs/models/components/TotalCount.md b/docs/models/components/TotalCount.md
index b7ba547..01f8e44 100644
--- a/docs/models/components/TotalCount.md
+++ b/docs/models/components/TotalCount.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                   | Type                                                                                                    | Required                                                                                                | Description                                                                                             |
-| ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                | [com.clerk.backend_api.models.components.TotalCountObject](../../models/components/TotalCountObject.md) | :heavy_check_mark:                                                                                      | String representing the object's type. Objects of the same type share the same value.<br/>              |
-| `totalCount`                                                                                            | *long*                                                                                                  | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
\ No newline at end of file
+| Field                                                                                  | Type                                                                                   | Required                                                                               | Description                                                                            |
+| -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- |
+| `object`                                                                               | [TotalCountObject](../../models/components/TotalCountObject.md)                        | :heavy_check_mark:                                                                     | String representing the object's type. Objects of the same type share the same value.<br/> |
+| `totalCount`                                                                           | *long*                                                                                 | :heavy_check_mark:                                                                     | N/A                                                                                    |
\ No newline at end of file
diff --git a/docs/models/components/User.md b/docs/models/components/User.md
index a8f0598..cc8fbe9 100644
--- a/docs/models/components/User.md
+++ b/docs/models/components/User.md
@@ -5,40 +5,40 @@
 
 | Field                                                                                                                                                                                                                           | Type                                                                                                                                                                                                                            | Required                                                                                                                                                                                                                        | Description                                                                                                                                                                                                                     | Example                                                                                                                                                                                                                         |
 | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `id`                                                                                                                                                                                                                            | *Optional<? extends String>*                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `object`                                                                                                                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.components.UserObject>](../../models/components/UserObject.md)                                                                                                                 | :heavy_minus_sign:                                                                                                                                                                                                              | String representing the object's type. Objects of the same type share the same value.<br/>                                                                                                                                      |                                                                                                                                                                                                                                 |
-| `externalId`                                                                                                                                                                                                                    | *JsonNullable<? extends String>*                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `primaryEmailAddressId`                                                                                                                                                                                                         | *JsonNullable<? extends String>*                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `primaryPhoneNumberId`                                                                                                                                                                                                          | *JsonNullable<? extends String>*                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `primaryWeb3WalletId`                                                                                                                                                                                                           | *JsonNullable<? extends String>*                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `username`                                                                                                                                                                                                                      | *JsonNullable<? extends String>*                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `firstName`                                                                                                                                                                                                                     | *JsonNullable<? extends String>*                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `lastName`                                                                                                                                                                                                                      | *JsonNullable<? extends String>*                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| ~~`profileImageUrl`~~                                                                                                                                                                                                           | *Optional<? extends String>*                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                              | : warning: ** DEPRECATED **: This will be removed in a future release, please migrate away from it as soon as possible.                                                                                                         |                                                                                                                                                                                                                                 |
-| `imageUrl`                                                                                                                                                                                                                      | *Optional<? extends String>*                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `hasImage`                                                                                                                                                                                                                      | *Optional<? extends Boolean>*                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `publicMetadata`                                                                                                                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.PublicMetadata>](../../models/components/PublicMetadata.md)                                                                                                         | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `privateMetadata`                                                                                                                                                                                                               | [JsonNullable<? extends com.clerk.backend_api.models.components.PrivateMetadata>](../../models/components/PrivateMetadata.md)                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `unsafeMetadata`                                                                                                                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.UnsafeMetadata>](../../models/components/UnsafeMetadata.md)                                                                                                         | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `emailAddresses`                                                                                                                                                                                                                | List<[com.clerk.backend_api.models.components.EmailAddress](../../models/components/EmailAddress.md)>                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `phoneNumbers`                                                                                                                                                                                                                  | List<[com.clerk.backend_api.models.components.PhoneNumber](../../models/components/PhoneNumber.md)>                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `web3Wallets`                                                                                                                                                                                                                   | List<[com.clerk.backend_api.models.components.Web3Wallet](../../models/components/Web3Wallet.md)>                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `passkeys`                                                                                                                                                                                                                      | List<[com.clerk.backend_api.models.components.SchemasPasskey](../../models/components/SchemasPasskey.md)>                                                                                                                       | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `passwordEnabled`                                                                                                                                                                                                               | *Optional<? extends Boolean>*                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `twoFactorEnabled`                                                                                                                                                                                                              | *Optional<? extends Boolean>*                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `totpEnabled`                                                                                                                                                                                                                   | *Optional<? extends Boolean>*                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `backupCodeEnabled`                                                                                                                                                                                                             | *Optional<? extends Boolean>*                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `mfaEnabledAt`                                                                                                                                                                                                                  | *JsonNullable<? extends Long>*                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                              | Unix timestamp of when MFA was last enabled for this user. It should be noted that this field is not nullified if MFA is disabled.<br/>                                                                                         |                                                                                                                                                                                                                                 |
-| `mfaDisabledAt`                                                                                                                                                                                                                 | *JsonNullable<? extends Long>*                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                              | Unix timestamp of when MFA was last disabled for this user. It should be noted that this field is not nullified if MFA is enabled again.<br/>                                                                                   |                                                                                                                                                                                                                                 |
-| `externalAccounts`                                                                                                                                                                                                              | List<[com.clerk.backend_api.models.components.ExternalAccounts](../../models/components/ExternalAccounts.md)>                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `samlAccounts`                                                                                                                                                                                                                  | List<[com.clerk.backend_api.models.components.SAMLAccount](../../models/components/SAMLAccount.md)>                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `lastSignInAt`                                                                                                                                                                                                                  | *JsonNullable<? extends Long>*                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                              | Unix timestamp of last sign-in.<br/>                                                                                                                                                                                            |                                                                                                                                                                                                                                 |
-| `banned`                                                                                                                                                                                                                        | *Optional<? extends Boolean>*                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                              | Flag to denote whether user is banned or not.<br/>                                                                                                                                                                              |                                                                                                                                                                                                                                 |
-| `locked`                                                                                                                                                                                                                        | *Optional<? extends Boolean>*                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                              | Flag to denote whether user is currently locked, i.e. restricted from signing in or not.<br/>                                                                                                                                   |                                                                                                                                                                                                                                 |
-| `lockoutExpiresInSeconds`                                                                                                                                                                                                       | *JsonNullable<? extends Long>*                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                              | The number of seconds remaining until the lockout period expires for a locked user. A null value for a locked user indicates that lockout never expires.<br/>                                                                   |                                                                                                                                                                                                                                 |
-| `verificationAttemptsRemaining`                                                                                                                                                                                                 | *JsonNullable<? extends Long>*                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                              | The number of verification attempts remaining until the user is locked. Null if account lockout is not enabled. Note: if a user is locked explicitly via the Backend API, they may still have verification attempts remaining.<br/> |                                                                                                                                                                                                                                 |
-| `updatedAt`                                                                                                                                                                                                                     | *Optional<? extends Long>*                                                                                                                                                                                                      | :heavy_minus_sign:                                                                                                                                                                                                              | Unix timestamp of last update.<br/>                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
-| `createdAt`                                                                                                                                                                                                                     | *Optional<? extends Long>*                                                                                                                                                                                                      | :heavy_minus_sign:                                                                                                                                                                                                              | Unix timestamp of creation.<br/>                                                                                                                                                                                                |                                                                                                                                                                                                                                 |
-| `deleteSelfEnabled`                                                                                                                                                                                                             | *Optional<? extends Boolean>*                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                              | If enabled, user can delete themselves via FAPI.<br/>                                                                                                                                                                           |                                                                                                                                                                                                                                 |
-| `createOrganizationEnabled`                                                                                                                                                                                                     | *Optional<? extends Boolean>*                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                              | If enabled, user can create organizations via FAPI.<br/>                                                                                                                                                                        |                                                                                                                                                                                                                                 |
-| `lastActiveAt`                                                                                                                                                                                                                  | *JsonNullable<? extends Long>*                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                              | Unix timestamp of the latest session activity, with day precision.<br/>                                                                                                                                                         | 1700690400000                                                                                                                                                                                                                   |
\ No newline at end of file
+| `id`                                                                                                                                                                                                                            | *Optional<String>*                                                                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `object`                                                                                                                                                                                                                        | [Optional<UserObject>](../../models/components/UserObject.md)                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                              | String representing the object's type. Objects of the same type share the same value.<br/>                                                                                                                                      |                                                                                                                                                                                                                                 |
+| `externalId`                                                                                                                                                                                                                    | *JsonNullable<String>*                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `primaryEmailAddressId`                                                                                                                                                                                                         | *JsonNullable<String>*                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `primaryPhoneNumberId`                                                                                                                                                                                                          | *JsonNullable<String>*                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `primaryWeb3WalletId`                                                                                                                                                                                                           | *JsonNullable<String>*                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `username`                                                                                                                                                                                                                      | *JsonNullable<String>*                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `firstName`                                                                                                                                                                                                                     | *JsonNullable<String>*                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `lastName`                                                                                                                                                                                                                      | *JsonNullable<String>*                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| ~~`profileImageUrl`~~                                                                                                                                                                                                           | *Optional<String>*                                                                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                                                              | : warning: ** DEPRECATED **: This will be removed in a future release, please migrate away from it as soon as possible.                                                                                                         |                                                                                                                                                                                                                                 |
+| `imageUrl`                                                                                                                                                                                                                      | *Optional<String>*                                                                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `hasImage`                                                                                                                                                                                                                      | *Optional<Boolean>*                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `publicMetadata`                                                                                                                                                                                                                | [Optional<PublicMetadata>](../../models/components/PublicMetadata.md)                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `privateMetadata`                                                                                                                                                                                                               | [JsonNullable<PrivateMetadata>](../../models/components/PrivateMetadata.md)                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `unsafeMetadata`                                                                                                                                                                                                                | [Optional<UnsafeMetadata>](../../models/components/UnsafeMetadata.md)                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `emailAddresses`                                                                                                                                                                                                                | List<[EmailAddress](../../models/components/EmailAddress.md)>                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `phoneNumbers`                                                                                                                                                                                                                  | List<[PhoneNumber](../../models/components/PhoneNumber.md)>                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `web3Wallets`                                                                                                                                                                                                                   | List<[Web3Wallet](../../models/components/Web3Wallet.md)>                                                                                                                                                                       | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `passkeys`                                                                                                                                                                                                                      | List<[SchemasPasskey](../../models/components/SchemasPasskey.md)>                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `passwordEnabled`                                                                                                                                                                                                               | *Optional<Boolean>*                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `twoFactorEnabled`                                                                                                                                                                                                              | *Optional<Boolean>*                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `totpEnabled`                                                                                                                                                                                                                   | *Optional<Boolean>*                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `backupCodeEnabled`                                                                                                                                                                                                             | *Optional<Boolean>*                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `mfaEnabledAt`                                                                                                                                                                                                                  | *JsonNullable<Long>*                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                              | Unix timestamp of when MFA was last enabled for this user. It should be noted that this field is not nullified if MFA is disabled.<br/>                                                                                         |                                                                                                                                                                                                                                 |
+| `mfaDisabledAt`                                                                                                                                                                                                                 | *JsonNullable<Long>*                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                              | Unix timestamp of when MFA was last disabled for this user. It should be noted that this field is not nullified if MFA is enabled again.<br/>                                                                                   |                                                                                                                                                                                                                                 |
+| `externalAccounts`                                                                                                                                                                                                              | List<[ExternalAccounts](../../models/components/ExternalAccounts.md)>                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `samlAccounts`                                                                                                                                                                                                                  | List<[SAMLAccount](../../models/components/SAMLAccount.md)>                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                              | N/A                                                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `lastSignInAt`                                                                                                                                                                                                                  | *JsonNullable<Long>*                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                              | Unix timestamp of last sign-in.<br/>                                                                                                                                                                                            |                                                                                                                                                                                                                                 |
+| `banned`                                                                                                                                                                                                                        | *Optional<Boolean>*                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                              | Flag to denote whether user is banned or not.<br/>                                                                                                                                                                              |                                                                                                                                                                                                                                 |
+| `locked`                                                                                                                                                                                                                        | *Optional<Boolean>*                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                              | Flag to denote whether user is currently locked, i.e. restricted from signing in or not.<br/>                                                                                                                                   |                                                                                                                                                                                                                                 |
+| `lockoutExpiresInSeconds`                                                                                                                                                                                                       | *JsonNullable<Long>*                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                              | The number of seconds remaining until the lockout period expires for a locked user. A null value for a locked user indicates that lockout never expires.<br/>                                                                   |                                                                                                                                                                                                                                 |
+| `verificationAttemptsRemaining`                                                                                                                                                                                                 | *JsonNullable<Long>*                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                              | The number of verification attempts remaining until the user is locked. Null if account lockout is not enabled. Note: if a user is locked explicitly via the Backend API, they may still have verification attempts remaining.<br/> |                                                                                                                                                                                                                                 |
+| `updatedAt`                                                                                                                                                                                                                     | *Optional<Long>*                                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                              | Unix timestamp of last update.<br/>                                                                                                                                                                                             |                                                                                                                                                                                                                                 |
+| `createdAt`                                                                                                                                                                                                                     | *Optional<Long>*                                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                              | Unix timestamp of creation.<br/>                                                                                                                                                                                                |                                                                                                                                                                                                                                 |
+| `deleteSelfEnabled`                                                                                                                                                                                                             | *Optional<Boolean>*                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                              | If enabled, user can delete themselves via FAPI.<br/>                                                                                                                                                                           |                                                                                                                                                                                                                                 |
+| `createOrganizationEnabled`                                                                                                                                                                                                     | *Optional<Boolean>*                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                              | If enabled, user can create organizations via FAPI.<br/>                                                                                                                                                                        |                                                                                                                                                                                                                                 |
+| `lastActiveAt`                                                                                                                                                                                                                  | *JsonNullable<Long>*                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                              | Unix timestamp of the latest session activity, with day precision.<br/>                                                                                                                                                         | 1700690400000                                                                                                                                                                                                                   |
\ No newline at end of file
diff --git a/docs/models/components/VerificationAdmin.md b/docs/models/components/VerificationAdmin.md
index dab3f3a..deb020e 100644
--- a/docs/models/components/VerificationAdmin.md
+++ b/docs/models/components/VerificationAdmin.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                       | Type                                                                                                                                        | Required                                                                                                                                    | Description                                                                                                                                 |
-| ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
-| `status`                                                                                                                                    | [com.clerk.backend_api.models.components.AdminVerificationPhoneNumberStatus](../../models/components/AdminVerificationPhoneNumberStatus.md) | :heavy_check_mark:                                                                                                                          | N/A                                                                                                                                         |
-| `strategy`                                                                                                                                  | [com.clerk.backend_api.models.components.AdminVerificationStrategy](../../models/components/AdminVerificationStrategy.md)                   | :heavy_check_mark:                                                                                                                          | N/A                                                                                                                                         |
-| `attempts`                                                                                                                                  | *JsonNullable<? extends Long>*                                                                                                              | :heavy_minus_sign:                                                                                                                          | N/A                                                                                                                                         |
-| `expireAt`                                                                                                                                  | *JsonNullable<? extends Long>*                                                                                                              | :heavy_minus_sign:                                                                                                                          | N/A                                                                                                                                         |
\ No newline at end of file
+| Field                                                                                               | Type                                                                                                | Required                                                                                            | Description                                                                                         |
+| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
+| `status`                                                                                            | [AdminVerificationPhoneNumberStatus](../../models/components/AdminVerificationPhoneNumberStatus.md) | :heavy_check_mark:                                                                                  | N/A                                                                                                 |
+| `strategy`                                                                                          | [AdminVerificationStrategy](../../models/components/AdminVerificationStrategy.md)                   | :heavy_check_mark:                                                                                  | N/A                                                                                                 |
+| `attempts`                                                                                          | *JsonNullable<Long>*                                                                                | :heavy_minus_sign:                                                                                  | N/A                                                                                                 |
+| `expireAt`                                                                                          | *JsonNullable<Long>*                                                                                | :heavy_minus_sign:                                                                                  | N/A                                                                                                 |
\ No newline at end of file
diff --git a/docs/models/components/VerificationOTP.md b/docs/models/components/VerificationOTP.md
index 4329c98..8dda9c7 100644
--- a/docs/models/components/VerificationOTP.md
+++ b/docs/models/components/VerificationOTP.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                 | Type                                                                                                                  | Required                                                                                                              | Description                                                                                                           |
-| --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- |
-| `status`                                                                                                              | [com.clerk.backend_api.models.components.OTPVerificationStatus](../../models/components/OTPVerificationStatus.md)     | :heavy_check_mark:                                                                                                    | N/A                                                                                                                   |
-| `strategy`                                                                                                            | [com.clerk.backend_api.models.components.OTPVerificationStrategy](../../models/components/OTPVerificationStrategy.md) | :heavy_check_mark:                                                                                                    | N/A                                                                                                                   |
-| `attempts`                                                                                                            | *long*                                                                                                                | :heavy_check_mark:                                                                                                    | N/A                                                                                                                   |
-| `expireAt`                                                                                                            | *long*                                                                                                                | :heavy_check_mark:                                                                                                    | N/A                                                                                                                   |
\ No newline at end of file
+| Field                                                                         | Type                                                                          | Required                                                                      | Description                                                                   |
+| ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- |
+| `status`                                                                      | [OTPVerificationStatus](../../models/components/OTPVerificationStatus.md)     | :heavy_check_mark:                                                            | N/A                                                                           |
+| `strategy`                                                                    | [OTPVerificationStrategy](../../models/components/OTPVerificationStrategy.md) | :heavy_check_mark:                                                            | N/A                                                                           |
+| `attempts`                                                                    | *Optional<Long>*                                                              | :heavy_minus_sign:                                                            | N/A                                                                           |
+| `expireAt`                                                                    | *Optional<Long>*                                                              | :heavy_minus_sign:                                                            | N/A                                                                           |
\ No newline at end of file
diff --git a/docs/models/components/Web3Signature.md b/docs/models/components/Web3Signature.md
index 6f2abcd..487884c 100644
--- a/docs/models/components/Web3Signature.md
+++ b/docs/models/components/Web3Signature.md
@@ -3,10 +3,10 @@
 
 ## Fields
 
-| Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
-| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `status`                                                                                                                                  | [com.clerk.backend_api.models.components.Web3SignatureVerificationStatus](../../models/components/Web3SignatureVerificationStatus.md)     | :heavy_check_mark:                                                                                                                        | N/A                                                                                                                                       |
-| `strategy`                                                                                                                                | [com.clerk.backend_api.models.components.Web3SignatureVerificationStrategy](../../models/components/Web3SignatureVerificationStrategy.md) | :heavy_check_mark:                                                                                                                        | N/A                                                                                                                                       |
-| `nonce`                                                                                                                                   | [com.clerk.backend_api.models.components.Nonce](../../models/components/Nonce.md)                                                         | :heavy_check_mark:                                                                                                                        | N/A                                                                                                                                       |
-| `attempts`                                                                                                                                | *JsonNullable<? extends Long>*                                                                                                            | :heavy_minus_sign:                                                                                                                        | N/A                                                                                                                                       |
-| `expireAt`                                                                                                                                | *JsonNullable<? extends Long>*                                                                                                            | :heavy_minus_sign:                                                                                                                        | N/A                                                                                                                                       |
\ No newline at end of file
+| Field                                                                                             | Type                                                                                              | Required                                                                                          | Description                                                                                       |
+| ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
+| `status`                                                                                          | [Web3SignatureVerificationStatus](../../models/components/Web3SignatureVerificationStatus.md)     | :heavy_check_mark:                                                                                | N/A                                                                                               |
+| `strategy`                                                                                        | [Web3SignatureVerificationStrategy](../../models/components/Web3SignatureVerificationStrategy.md) | :heavy_check_mark:                                                                                | N/A                                                                                               |
+| `nonce`                                                                                           | [Nonce](../../models/components/Nonce.md)                                                         | :heavy_check_mark:                                                                                | N/A                                                                                               |
+| `attempts`                                                                                        | *JsonNullable<Long>*                                                                              | :heavy_minus_sign:                                                                                | N/A                                                                                               |
+| `expireAt`                                                                                        | *JsonNullable<Long>*                                                                              | :heavy_minus_sign:                                                                                | N/A                                                                                               |
\ No newline at end of file
diff --git a/docs/models/components/Web3Wallet.md b/docs/models/components/Web3Wallet.md
index 08e8e33..28f9560 100644
--- a/docs/models/components/Web3Wallet.md
+++ b/docs/models/components/Web3Wallet.md
@@ -3,11 +3,11 @@
 
 ## Fields
 
-| Field                                                                                                                                   | Type                                                                                                                                    | Required                                                                                                                                | Description                                                                                                                             |
-| --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `id`                                                                                                                                    | *Optional<? extends String>*                                                                                                            | :heavy_minus_sign:                                                                                                                      | N/A                                                                                                                                     |
-| `object`                                                                                                                                | [com.clerk.backend_api.models.components.Web3WalletObject](../../models/components/Web3WalletObject.md)                                 | :heavy_check_mark:                                                                                                                      | String representing the object's type. Objects of the same type share the same value.<br/>                                              |
-| `web3Wallet`                                                                                                                            | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | N/A                                                                                                                                     |
-| `verification`                                                                                                                          | [Optional<? extends com.clerk.backend_api.models.components.Web3WalletVerification>](../../models/components/Web3WalletVerification.md) | :heavy_check_mark:                                                                                                                      | N/A                                                                                                                                     |
-| `createdAt`                                                                                                                             | *long*                                                                                                                                  | :heavy_check_mark:                                                                                                                      | Unix timestamp of creation<br/>                                                                                                         |
-| `updatedAt`                                                                                                                             | *long*                                                                                                                                  | :heavy_check_mark:                                                                                                                      | Unix timestamp of creation<br/>                                                                                                         |
\ No newline at end of file
+| Field                                                                                  | Type                                                                                   | Required                                                                               | Description                                                                            |
+| -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- |
+| `id`                                                                                   | *Optional<String>*                                                                     | :heavy_minus_sign:                                                                     | N/A                                                                                    |
+| `object`                                                                               | [Web3WalletObject](../../models/components/Web3WalletObject.md)                        | :heavy_check_mark:                                                                     | String representing the object's type. Objects of the same type share the same value.<br/> |
+| `web3Wallet`                                                                           | *String*                                                                               | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `verification`                                                                         | [Optional<Web3WalletVerification>](../../models/components/Web3WalletVerification.md)  | :heavy_check_mark:                                                                     | N/A                                                                                    |
+| `createdAt`                                                                            | *long*                                                                                 | :heavy_check_mark:                                                                     | Unix timestamp of creation<br/>                                                        |
+| `updatedAt`                                                                            | *long*                                                                                 | :heavy_check_mark:                                                                     | Unix timestamp of creation<br/>                                                        |
\ No newline at end of file
diff --git a/docs/models/components/Web3WalletVerificationAdmin.md b/docs/models/components/Web3WalletVerificationAdmin.md
index 6de2aa5..e326814 100644
--- a/docs/models/components/Web3WalletVerificationAdmin.md
+++ b/docs/models/components/Web3WalletVerificationAdmin.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                         | Type                                                                                                                                          | Required                                                                                                                                      | Description                                                                                                                                   |
-| --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| `status`                                                                                                                                      | [com.clerk.backend_api.models.components.AdminVerificationWeb3WalletStatus](../../models/components/AdminVerificationWeb3WalletStatus.md)     | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
-| `strategy`                                                                                                                                    | [com.clerk.backend_api.models.components.AdminVerificationWeb3WalletStrategy](../../models/components/AdminVerificationWeb3WalletStrategy.md) | :heavy_check_mark:                                                                                                                            | N/A                                                                                                                                           |
-| `attempts`                                                                                                                                    | *JsonNullable<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
-| `expireAt`                                                                                                                                    | *JsonNullable<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
\ No newline at end of file
+| Field                                                                                                 | Type                                                                                                  | Required                                                                                              | Description                                                                                           |
+| ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- |
+| `status`                                                                                              | [AdminVerificationWeb3WalletStatus](../../models/components/AdminVerificationWeb3WalletStatus.md)     | :heavy_check_mark:                                                                                    | N/A                                                                                                   |
+| `strategy`                                                                                            | [AdminVerificationWeb3WalletStrategy](../../models/components/AdminVerificationWeb3WalletStrategy.md) | :heavy_check_mark:                                                                                    | N/A                                                                                                   |
+| `attempts`                                                                                            | *JsonNullable<Long>*                                                                                  | :heavy_minus_sign:                                                                                    | N/A                                                                                                   |
+| `expireAt`                                                                                            | *JsonNullable<Long>*                                                                                  | :heavy_minus_sign:                                                                                    | N/A                                                                                                   |
\ No newline at end of file
diff --git a/docs/models/errors/ClerkErrors.md b/docs/models/errors/ClerkErrors.md
index ec72b41..958613d 100644
--- a/docs/models/errors/ClerkErrors.md
+++ b/docs/models/errors/ClerkErrors.md
@@ -5,7 +5,7 @@ Request was not successful
 
 ## Fields
 
-| Field                                                                                             | Type                                                                                              | Required                                                                                          | Description                                                                                       |
-| ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
-| `errors`                                                                                          | List<[com.clerk.backend_api.models.components.ClerkError](../../models/components/ClerkError.md)> | :heavy_check_mark:                                                                                | N/A                                                                                               |
-| `meta`                                                                                            | [Optional<? extends com.clerk.backend_api.models.errors.Meta>](../../models/errors/Meta.md)       | :heavy_minus_sign:                                                                                | N/A                                                                                               |
\ No newline at end of file
+| Field                                                     | Type                                                      | Required                                                  | Description                                               |
+| --------------------------------------------------------- | --------------------------------------------------------- | --------------------------------------------------------- | --------------------------------------------------------- |
+| `errors`                                                  | List<[ClerkError](../../models/components/ClerkError.md)> | :heavy_check_mark:                                        | N/A                                                       |
+| `meta`                                                    | [Optional<Meta>](../../models/errors/Meta.md)             | :heavy_minus_sign:                                        | N/A                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/AddDomainRequestBody.md b/docs/models/operations/AddDomainRequestBody.md
index c8ba329..08ae43d 100644
--- a/docs/models/operations/AddDomainRequestBody.md
+++ b/docs/models/operations/AddDomainRequestBody.md
@@ -7,4 +7,4 @@
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
 | `name`                                                                                                                                    | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | The new domain name. Can contain the port for development instances.                                                                      |
 | `isSatellite`                                                                                                                             | *boolean*                                                                                                                                 | :heavy_check_mark:                                                                                                                        | Marks the new domain as satellite. Only `true` is accepted at the moment.                                                                 |
-| `proxyUrl`                                                                                                                                | *Optional<? extends String>*                                                                                                              | :heavy_minus_sign:                                                                                                                        | The full URL of the proxy which will forward requests to the Clerk Frontend API for this domain. Applicable only to production instances. |
\ No newline at end of file
+| `proxyUrl`                                                                                                                                | *Optional<String>*                                                                                                                        | :heavy_minus_sign:                                                                                                                        | The full URL of the proxy which will forward requests to the Clerk Frontend API for this domain. Applicable only to production instances. |
\ No newline at end of file
diff --git a/docs/models/operations/AddDomainResponse.md b/docs/models/operations/AddDomainResponse.md
index 58833a8..3d29a1b 100644
--- a/docs/models/operations/AddDomainResponse.md
+++ b/docs/models/operations/AddDomainResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `domain`                                                                                                                      | [Optional<? extends com.clerk.backend_api.models.components.Domain>](../../models/components/Domain.md)                       | :heavy_minus_sign:                                                                                                            | A domain                                                                                                                      |
\ No newline at end of file
+| `domain`                                                                                                                      | [Optional<Domain>](../../models/components/Domain.md)                                                                         | :heavy_minus_sign:                                                                                                            | A domain                                                                                                                      |
\ No newline at end of file
diff --git a/docs/models/operations/AttributeMapping.md b/docs/models/operations/AttributeMapping.md
index f809916..31d3901 100644
--- a/docs/models/operations/AttributeMapping.md
+++ b/docs/models/operations/AttributeMapping.md
@@ -5,9 +5,9 @@ Define the attribute name mapping between Identity Provider and Clerk's user pro
 
 ## Fields
 
-| Field                        | Type                         | Required                     | Description                  |
-| ---------------------------- | ---------------------------- | ---------------------------- | ---------------------------- |
-| `userId`                     | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
-| `emailAddress`               | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
-| `firstName`                  | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
-| `lastName`                   | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
\ No newline at end of file
+| Field              | Type               | Required           | Description        |
+| ------------------ | ------------------ | ------------------ | ------------------ |
+| `userId`           | *Optional<String>* | :heavy_minus_sign: | N/A                |
+| `emailAddress`     | *Optional<String>* | :heavy_minus_sign: | N/A                |
+| `firstName`        | *Optional<String>* | :heavy_minus_sign: | N/A                |
+| `lastName`         | *Optional<String>* | :heavy_minus_sign: | N/A                |
\ No newline at end of file
diff --git a/docs/models/operations/BanUserResponse.md b/docs/models/operations/BanUserResponse.md
index d5f3289..8b0b006 100644
--- a/docs/models/operations/BanUserResponse.md
+++ b/docs/models/operations/BanUserResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `user`                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.components.User>](../../models/components/User.md)                           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `user`                                                                                                                        | [Optional<User>](../../models/components/User.md)                                                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/ChangeProductionInstanceDomainRequestBody.md b/docs/models/operations/ChangeProductionInstanceDomainRequestBody.md
index da4d960..af1c182 100644
--- a/docs/models/operations/ChangeProductionInstanceDomainRequestBody.md
+++ b/docs/models/operations/ChangeProductionInstanceDomainRequestBody.md
@@ -5,4 +5,4 @@
 
 | Field                                                                    | Type                                                                     | Required                                                                 | Description                                                              |
 | ------------------------------------------------------------------------ | ------------------------------------------------------------------------ | ------------------------------------------------------------------------ | ------------------------------------------------------------------------ |
-| `homeUrl`                                                                | *Optional<? extends String>*                                             | :heavy_minus_sign:                                                       | The new home URL of the production instance e.g. https://www.example.com |
\ No newline at end of file
+| `homeUrl`                                                                | *Optional<String>*                                                       | :heavy_minus_sign:                                                       | The new home URL of the production instance e.g. https://www.example.com |
\ No newline at end of file
diff --git a/docs/models/operations/CreateActorTokenRequestBody.md b/docs/models/operations/CreateActorTokenRequestBody.md
index 2a6e7cb..62beaac 100644
--- a/docs/models/operations/CreateActorTokenRequestBody.md
+++ b/docs/models/operations/CreateActorTokenRequestBody.md
@@ -6,6 +6,6 @@
 | Field                                                                                                                                                                                     | Type                                                                                                                                                                                      | Required                                                                                                                                                                                  | Description                                                                                                                                                                               | Example                                                                                                                                                                                   |
 | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `userId`                                                                                                                                                                                  | *String*                                                                                                                                                                                  | :heavy_check_mark:                                                                                                                                                                        | The ID of the user that can use the newly created sign in token.                                                                                                                          |                                                                                                                                                                                           |
-| `actor`                                                                                                                                                                                   | Map<String, *java.lang.Object*>                                                                                                                                                           | :heavy_check_mark:                                                                                                                                                                        | The actor payload. It needs to include a sub property which should contain the ID of the actor.<br/>This whole payload will be also included in the JWT session token.                    | {<br/>"sub": "user_2OEpKhcCN1Lat9NQ0G6puh7q5Rb"<br/>}                                                                                                                                     |
-| `expiresInSeconds`                                                                                                                                                                        | *Optional<? extends Long>*                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                        | Optional parameter to specify the life duration of the actor token in seconds.<br/>By default, the duration is 1 hour.                                                                    |                                                                                                                                                                                           |
-| `sessionMaxDurationInSeconds`                                                                                                                                                             | *Optional<? extends Long>*                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                        | The maximum duration that the session which will be created by the generated actor token should last.<br/>By default, the duration of a session created via an actor token, lasts 30 minutes. |                                                                                                                                                                                           |
\ No newline at end of file
+| `actor`                                                                                                                                                                                   | Map<String, *Object*>                                                                                                                                                                     | :heavy_check_mark:                                                                                                                                                                        | The actor payload. It needs to include a sub property which should contain the ID of the actor.<br/>This whole payload will be also included in the JWT session token.                    | {<br/>"sub": "user_2OEpKhcCN1Lat9NQ0G6puh7q5Rb"<br/>}                                                                                                                                     |
+| `expiresInSeconds`                                                                                                                                                                        | *Optional<Long>*                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                        | Optional parameter to specify the life duration of the actor token in seconds.<br/>By default, the duration is 1 hour.                                                                    |                                                                                                                                                                                           |
+| `sessionMaxDurationInSeconds`                                                                                                                                                             | *Optional<Long>*                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                        | The maximum duration that the session which will be created by the generated actor token should last.<br/>By default, the duration of a session created via an actor token, lasts 30 minutes. |                                                                                                                                                                                           |
\ No newline at end of file
diff --git a/docs/models/operations/CreateActorTokenResponse.md b/docs/models/operations/CreateActorTokenResponse.md
index 61e153a..37357dc 100644
--- a/docs/models/operations/CreateActorTokenResponse.md
+++ b/docs/models/operations/CreateActorTokenResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `actorToken`                                                                                                                  | [Optional<? extends com.clerk.backend_api.models.components.ActorToken>](../../models/components/ActorToken.md)               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `actorToken`                                                                                                                  | [Optional<ActorToken>](../../models/components/ActorToken.md)                                                                 | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/CreateAllowlistIdentifierRequestBody.md b/docs/models/operations/CreateAllowlistIdentifierRequestBody.md
index dad20a9..cb09bac 100644
--- a/docs/models/operations/CreateAllowlistIdentifierRequestBody.md
+++ b/docs/models/operations/CreateAllowlistIdentifierRequestBody.md
@@ -6,4 +6,4 @@
 | Field                                                                                                                                                                        | Type                                                                                                                                                                         | Required                                                                                                                                                                     | Description                                                                                                                                                                  |
 | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `identifier`                                                                                                                                                                 | *String*                                                                                                                                                                     | :heavy_check_mark:                                                                                                                                                           | The identifier to be added in the allow-list.<br/>This can be an email address, a phone number or a web3 wallet.                                                             |
-| `notify_`                                                                                                                                                                    | *Optional<? extends Boolean>*                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                           | This flag denotes whether the given identifier will receive an invitation to join the application.<br/>Note that this only works for email address and phone number identifiers. |
\ No newline at end of file
+| `notify_`                                                                                                                                                                    | *Optional<Boolean>*                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                           | This flag denotes whether the given identifier will receive an invitation to join the application.<br/>Note that this only works for email address and phone number identifiers. |
\ No newline at end of file
diff --git a/docs/models/operations/CreateAllowlistIdentifierResponse.md b/docs/models/operations/CreateAllowlistIdentifierResponse.md
index a1b3f19..500e1c1 100644
--- a/docs/models/operations/CreateAllowlistIdentifierResponse.md
+++ b/docs/models/operations/CreateAllowlistIdentifierResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                             | Type                                                                                                                              | Required                                                                                                                          | Description                                                                                                                       |
-| --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                     | *String*                                                                                                                          | :heavy_check_mark:                                                                                                                | HTTP response content type for this operation                                                                                     |
-| `statusCode`                                                                                                                      | *int*                                                                                                                             | :heavy_check_mark:                                                                                                                | HTTP response status code for this operation                                                                                      |
-| `rawResponse`                                                                                                                     | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)     | :heavy_check_mark:                                                                                                                | Raw HTTP response; suitable for custom response parsing                                                                           |
-| `allowlistIdentifier`                                                                                                             | [Optional<? extends com.clerk.backend_api.models.components.AllowlistIdentifier>](../../models/components/AllowlistIdentifier.md) | :heavy_minus_sign:                                                                                                                | Success                                                                                                                           |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `allowlistIdentifier`                                                                                                         | [Optional<AllowlistIdentifier>](../../models/components/AllowlistIdentifier.md)                                               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/CreateBlocklistIdentifierResponse.md b/docs/models/operations/CreateBlocklistIdentifierResponse.md
index b6f14b6..e3fab1f 100644
--- a/docs/models/operations/CreateBlocklistIdentifierResponse.md
+++ b/docs/models/operations/CreateBlocklistIdentifierResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                             | Type                                                                                                                              | Required                                                                                                                          | Description                                                                                                                       |
-| --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                     | *String*                                                                                                                          | :heavy_check_mark:                                                                                                                | HTTP response content type for this operation                                                                                     |
-| `statusCode`                                                                                                                      | *int*                                                                                                                             | :heavy_check_mark:                                                                                                                | HTTP response status code for this operation                                                                                      |
-| `rawResponse`                                                                                                                     | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)     | :heavy_check_mark:                                                                                                                | Raw HTTP response; suitable for custom response parsing                                                                           |
-| `blocklistIdentifier`                                                                                                             | [Optional<? extends com.clerk.backend_api.models.components.BlocklistIdentifier>](../../models/components/BlocklistIdentifier.md) | :heavy_minus_sign:                                                                                                                | Success                                                                                                                           |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `blocklistIdentifier`                                                                                                         | [Optional<BlocklistIdentifier>](../../models/components/BlocklistIdentifier.md)                                               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/CreateEmailAddressRequestBody.md b/docs/models/operations/CreateEmailAddressRequestBody.md
index 5d32bba..c02a8aa 100644
--- a/docs/models/operations/CreateEmailAddressRequestBody.md
+++ b/docs/models/operations/CreateEmailAddressRequestBody.md
@@ -5,7 +5,7 @@
 
 | Field                                                                                                                      | Type                                                                                                                       | Required                                                                                                                   | Description                                                                                                                |
 | -------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------- |
-| `userId`                                                                                                                   | *Optional<? extends String>*                                                                                               | :heavy_minus_sign:                                                                                                         | The ID representing the user                                                                                               |
-| `emailAddress`                                                                                                             | *Optional<? extends String>*                                                                                               | :heavy_minus_sign:                                                                                                         | The new email address. Must adhere to the RFC 5322 specification for email address format.                                 |
-| `verified`                                                                                                                 | *JsonNullable<? extends Boolean>*                                                                                          | :heavy_minus_sign:                                                                                                         | When created, the email address will be marked as verified.                                                                |
-| `primary`                                                                                                                  | *JsonNullable<? extends Boolean>*                                                                                          | :heavy_minus_sign:                                                                                                         | Create this email address as the primary email address for the user.<br/>Default: false, unless it is the first email address. |
\ No newline at end of file
+| `userId`                                                                                                                   | *Optional<String>*                                                                                                         | :heavy_minus_sign:                                                                                                         | The ID representing the user                                                                                               |
+| `emailAddress`                                                                                                             | *Optional<String>*                                                                                                         | :heavy_minus_sign:                                                                                                         | The new email address. Must adhere to the RFC 5322 specification for email address format.                                 |
+| `verified`                                                                                                                 | *JsonNullable<Boolean>*                                                                                                    | :heavy_minus_sign:                                                                                                         | When created, the email address will be marked as verified.                                                                |
+| `primary`                                                                                                                  | *JsonNullable<Boolean>*                                                                                                    | :heavy_minus_sign:                                                                                                         | Create this email address as the primary email address for the user.<br/>Default: false, unless it is the first email address. |
\ No newline at end of file
diff --git a/docs/models/operations/CreateEmailAddressResponse.md b/docs/models/operations/CreateEmailAddressResponse.md
index 581622f..a063c98 100644
--- a/docs/models/operations/CreateEmailAddressResponse.md
+++ b/docs/models/operations/CreateEmailAddressResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `emailAddress`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.EmailAddress>](../../models/components/EmailAddress.md)           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `emailAddress`                                                                                                                | [Optional<EmailAddress>](../../models/components/EmailAddress.md)                                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/CreateInvitationRequestBody.md b/docs/models/operations/CreateInvitationRequestBody.md
index 07bf90e..216d47a 100644
--- a/docs/models/operations/CreateInvitationRequestBody.md
+++ b/docs/models/operations/CreateInvitationRequestBody.md
@@ -8,7 +8,7 @@ Required parameters
 | Field                                                                                                                                                                                                                                                                                  | Type                                                                                                                                                                                                                                                                                   | Required                                                                                                                                                                                                                                                                               | Description                                                                                                                                                                                                                                                                            |
 | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `emailAddress`                                                                                                                                                                                                                                                                         | *String*                                                                                                                                                                                                                                                                               | :heavy_check_mark:                                                                                                                                                                                                                                                                     | The email address the invitation will be sent to                                                                                                                                                                                                                                       |
-| `publicMetadata`                                                                                                                                                                                                                                                                       | [Optional<? extends com.clerk.backend_api.models.operations.CreateInvitationPublicMetadata>](../../models/operations/CreateInvitationPublicMetadata.md)                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                                                                                     | Metadata that will be attached to the newly created invitation.<br/>The value of this property should be a well-formed JSON object.<br/>Once the user accepts the invitation and signs up, these metadata will end up in the user's public metadata.                                   |
-| `redirectUrl`                                                                                                                                                                                                                                                                          | *Optional<? extends String>*                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                     | Optional URL which specifies where to redirect the user once they click the invitation link.<br/>This is only required if you have implemented a [custom flow](https://clerk.com/docs/authentication/invitations#custom-flow) and you're not using Clerk Hosted Pages or Clerk Components. |
-| `notify_`                                                                                                                                                                                                                                                                              | *JsonNullable<? extends Boolean>*                                                                                                                                                                                                                                                      | :heavy_minus_sign:                                                                                                                                                                                                                                                                     | Optional flag which denotes whether an email invitation should be sent to the given email address.<br/>Defaults to true.                                                                                                                                                               |
-| `ignoreExisting`                                                                                                                                                                                                                                                                       | *JsonNullable<? extends Boolean>*                                                                                                                                                                                                                                                      | :heavy_minus_sign:                                                                                                                                                                                                                                                                     | Whether an invitation should be created if there is already an existing invitation for this email address, or it's claimed by another user.                                                                                                                                            |
\ No newline at end of file
+| `publicMetadata`                                                                                                                                                                                                                                                                       | [Optional<CreateInvitationPublicMetadata>](../../models/operations/CreateInvitationPublicMetadata.md)                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                                                                     | Metadata that will be attached to the newly created invitation.<br/>The value of this property should be a well-formed JSON object.<br/>Once the user accepts the invitation and signs up, these metadata will end up in the user's public metadata.                                   |
+| `redirectUrl`                                                                                                                                                                                                                                                                          | *Optional<String>*                                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                                     | Optional URL which specifies where to redirect the user once they click the invitation link.<br/>This is only required if you have implemented a [custom flow](https://clerk.com/docs/authentication/invitations#custom-flow) and you're not using Clerk Hosted Pages or Clerk Components. |
+| `notify_`                                                                                                                                                                                                                                                                              | *JsonNullable<Boolean>*                                                                                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                                                                                     | Optional flag which denotes whether an email invitation should be sent to the given email address.<br/>Defaults to true.                                                                                                                                                               |
+| `ignoreExisting`                                                                                                                                                                                                                                                                       | *JsonNullable<Boolean>*                                                                                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                                                                                     | Whether an invitation should be created if there is already an existing invitation for this email address, or it's claimed by another user.                                                                                                                                            |
\ No newline at end of file
diff --git a/docs/models/operations/CreateInvitationResponse.md b/docs/models/operations/CreateInvitationResponse.md
index ff0b44a..f29e43c 100644
--- a/docs/models/operations/CreateInvitationResponse.md
+++ b/docs/models/operations/CreateInvitationResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `invitation`                                                                                                                  | [Optional<? extends com.clerk.backend_api.models.components.Invitation>](../../models/components/Invitation.md)               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `invitation`                                                                                                                  | [Optional<Invitation>](../../models/components/Invitation.md)                                                                 | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/CreateJWTTemplateRequestBody.md b/docs/models/operations/CreateJWTTemplateRequestBody.md
index 9e14cdc..5f0ab31 100644
--- a/docs/models/operations/CreateJWTTemplateRequestBody.md
+++ b/docs/models/operations/CreateJWTTemplateRequestBody.md
@@ -3,12 +3,12 @@
 
 ## Fields
 
-| Field                                                                                                   | Type                                                                                                    | Required                                                                                                | Description                                                                                             |
-| ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- |
-| `name`                                                                                                  | *Optional<? extends String>*                                                                            | :heavy_minus_sign:                                                                                      | JWT template name                                                                                       |
-| `claims`                                                                                                | [Optional<? extends com.clerk.backend_api.models.operations.Claims>](../../models/operations/Claims.md) | :heavy_minus_sign:                                                                                      | JWT template claims in JSON format                                                                      |
-| `lifetime`                                                                                              | *JsonNullable<? extends Double>*                                                                        | :heavy_minus_sign:                                                                                      | JWT token lifetime                                                                                      |
-| `allowedClockSkew`                                                                                      | *JsonNullable<? extends Double>*                                                                        | :heavy_minus_sign:                                                                                      | JWT token allowed clock skew                                                                            |
-| `customSigningKey`                                                                                      | *Optional<? extends Boolean>*                                                                           | :heavy_minus_sign:                                                                                      | Whether a custom signing key/algorithm is also provided for this template                               |
-| `signingAlgorithm`                                                                                      | *JsonNullable<? extends String>*                                                                        | :heavy_minus_sign:                                                                                      | The custom signing algorithm to use when minting JWTs                                                   |
-| `signingKey`                                                                                            | *JsonNullable<? extends String>*                                                                        | :heavy_minus_sign:                                                                                      | The custom signing private key to use when minting JWTs                                                 |
\ No newline at end of file
+| Field                                                                     | Type                                                                      | Required                                                                  | Description                                                               |
+| ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- |
+| `name`                                                                    | *Optional<String>*                                                        | :heavy_minus_sign:                                                        | JWT template name                                                         |
+| `claims`                                                                  | [Optional<Claims>](../../models/operations/Claims.md)                     | :heavy_minus_sign:                                                        | JWT template claims in JSON format                                        |
+| `lifetime`                                                                | *JsonNullable<Double>*                                                    | :heavy_minus_sign:                                                        | JWT token lifetime                                                        |
+| `allowedClockSkew`                                                        | *JsonNullable<Double>*                                                    | :heavy_minus_sign:                                                        | JWT token allowed clock skew                                              |
+| `customSigningKey`                                                        | *Optional<Boolean>*                                                       | :heavy_minus_sign:                                                        | Whether a custom signing key/algorithm is also provided for this template |
+| `signingAlgorithm`                                                        | *JsonNullable<String>*                                                    | :heavy_minus_sign:                                                        | The custom signing algorithm to use when minting JWTs                     |
+| `signingKey`                                                              | *JsonNullable<String>*                                                    | :heavy_minus_sign:                                                        | The custom signing private key to use when minting JWTs                   |
\ No newline at end of file
diff --git a/docs/models/operations/CreateJWTTemplateResponse.md b/docs/models/operations/CreateJWTTemplateResponse.md
index 3d9366c..052a6ea 100644
--- a/docs/models/operations/CreateJWTTemplateResponse.md
+++ b/docs/models/operations/CreateJWTTemplateResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `jwtTemplate`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.JWTTemplate>](../../models/components/JWTTemplate.md)             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `jwtTemplate`                                                                                                                 | [Optional<JWTTemplate>](../../models/components/JWTTemplate.md)                                                               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/CreateOAuthApplicationRequestBody.md b/docs/models/operations/CreateOAuthApplicationRequestBody.md
index 4086744..e7c68d8 100644
--- a/docs/models/operations/CreateOAuthApplicationRequestBody.md
+++ b/docs/models/operations/CreateOAuthApplicationRequestBody.md
@@ -7,5 +7,5 @@
 | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `name`                                                                                                                                                                                                                                                                 | *String*                                                                                                                                                                                                                                                               | :heavy_check_mark:                                                                                                                                                                                                                                                     | The name of the new OAuth application                                                                                                                                                                                                                                  |                                                                                                                                                                                                                                                                        |
 | `callbackUrl`                                                                                                                                                                                                                                                          | *String*                                                                                                                                                                                                                                                               | :heavy_check_mark:                                                                                                                                                                                                                                                     | The callback URL of the new OAuth application                                                                                                                                                                                                                          |                                                                                                                                                                                                                                                                        |
-| `scopes`                                                                                                                                                                                                                                                               | *Optional<? extends String>*                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                     | Define the allowed scopes for the new OAuth applications that dictate the user payload of the OAuth user info endpoint. Available scopes are `profile`, `email`, `public_metadata`, `private_metadata`. Provide the requested scopes as a string, separated by spaces. | profile email public_metadata                                                                                                                                                                                                                                          |
-| `public_`                                                                                                                                                                                                                                                              | *Optional<? extends Boolean>*                                                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                                                                     | If true, this client is public and cannot securely store a client secret.<br/>Only the authorization code flow with proof key for code exchange (PKCE) may be used.<br/>Public clients cannot be updated to be confidential clients, and vice versa.                   |                                                                                                                                                                                                                                                                        |
\ No newline at end of file
+| `scopes`                                                                                                                                                                                                                                                               | *Optional<String>*                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                     | Define the allowed scopes for the new OAuth applications that dictate the user payload of the OAuth user info endpoint. Available scopes are `profile`, `email`, `public_metadata`, `private_metadata`. Provide the requested scopes as a string, separated by spaces. | profile email public_metadata                                                                                                                                                                                                                                          |
+| `public_`                                                                                                                                                                                                                                                              | *Optional<Boolean>*                                                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                                                     | If true, this client is public and cannot securely store a client secret.<br/>Only the authorization code flow with proof key for code exchange (PKCE) may be used.<br/>Public clients cannot be updated to be confidential clients, and vice versa.                   |                                                                                                                                                                                                                                                                        |
\ No newline at end of file
diff --git a/docs/models/operations/CreateOAuthApplicationResponse.md b/docs/models/operations/CreateOAuthApplicationResponse.md
index 6470b12..84c9aca 100644
--- a/docs/models/operations/CreateOAuthApplicationResponse.md
+++ b/docs/models/operations/CreateOAuthApplicationResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                           | Type                                                                                                                                            | Required                                                                                                                                        | Description                                                                                                                                     |
-| ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                                   | *String*                                                                                                                                        | :heavy_check_mark:                                                                                                                              | HTTP response content type for this operation                                                                                                   |
-| `statusCode`                                                                                                                                    | *int*                                                                                                                                           | :heavy_check_mark:                                                                                                                              | HTTP response status code for this operation                                                                                                    |
-| `rawResponse`                                                                                                                                   | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)                   | :heavy_check_mark:                                                                                                                              | Raw HTTP response; suitable for custom response parsing                                                                                         |
-| `oAuthApplicationWithSecret`                                                                                                                    | [Optional<? extends com.clerk.backend_api.models.components.OAuthApplicationWithSecret>](../../models/components/OAuthApplicationWithSecret.md) | :heavy_minus_sign:                                                                                                                              | An OAuth application with client secret                                                                                                         |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `oAuthApplicationWithSecret`                                                                                                  | [Optional<OAuthApplicationWithSecret>](../../models/components/OAuthApplicationWithSecret.md)                                 | :heavy_minus_sign:                                                                                                            | An OAuth application with client secret                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/CreateOrganizationInvitationBulkRequest.md b/docs/models/operations/CreateOrganizationInvitationBulkRequest.md
index 1f0a3ef..142b953 100644
--- a/docs/models/operations/CreateOrganizationInvitationBulkRequest.md
+++ b/docs/models/operations/CreateOrganizationInvitationBulkRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                               | Type                                                                                                | Required                                                                                            | Description                                                                                         |
-| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                    | *String*                                                                                            | :heavy_check_mark:                                                                                  | The organization ID.                                                                                |
-| `requestBody`                                                                                       | List<[com.clerk.backend_api.models.operations.RequestBody](../../models/operations/RequestBody.md)> | :heavy_check_mark:                                                                                  | N/A                                                                                                 |
\ No newline at end of file
+| Field                                                       | Type                                                        | Required                                                    | Description                                                 |
+| ----------------------------------------------------------- | ----------------------------------------------------------- | ----------------------------------------------------------- | ----------------------------------------------------------- |
+| `organizationId`                                            | *String*                                                    | :heavy_check_mark:                                          | The organization ID.                                        |
+| `requestBody`                                               | List<[RequestBody](../../models/operations/RequestBody.md)> | :heavy_check_mark:                                          | N/A                                                         |
\ No newline at end of file
diff --git a/docs/models/operations/CreateOrganizationInvitationBulkResponse.md b/docs/models/operations/CreateOrganizationInvitationBulkResponse.md
index 3bfa8e6..a9e40c0 100644
--- a/docs/models/operations/CreateOrganizationInvitationBulkResponse.md
+++ b/docs/models/operations/CreateOrganizationInvitationBulkResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
-| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                             | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | HTTP response content type for this operation                                                                                             |
-| `statusCode`                                                                                                                              | *int*                                                                                                                                     | :heavy_check_mark:                                                                                                                        | HTTP response status code for this operation                                                                                              |
-| `rawResponse`                                                                                                                             | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)             | :heavy_check_mark:                                                                                                                        | Raw HTTP response; suitable for custom response parsing                                                                                   |
-| `organizationInvitations`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations>](../../models/components/OrganizationInvitations.md) | :heavy_minus_sign:                                                                                                                        | A list of organization invitations                                                                                                        |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `organizationInvitations`                                                                                                     | [Optional<OrganizationInvitations>](../../models/components/OrganizationInvitations.md)                                       | :heavy_minus_sign:                                                                                                            | A list of organization invitations                                                                                            |
\ No newline at end of file
diff --git a/docs/models/operations/CreateOrganizationInvitationRequest.md b/docs/models/operations/CreateOrganizationInvitationRequest.md
index 59e3d10..ad86a2b 100644
--- a/docs/models/operations/CreateOrganizationInvitationRequest.md
+++ b/docs/models/operations/CreateOrganizationInvitationRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                                 | Type                                                                                                                                                  | Required                                                                                                                                              | Description                                                                                                                                           |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                      | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The ID of the organization for which to send the invitation                                                                                           |
-| `requestBody`                                                                                                                                         | [com.clerk.backend_api.models.operations.CreateOrganizationInvitationRequestBody](../../models/operations/CreateOrganizationInvitationRequestBody.md) | :heavy_check_mark:                                                                                                                                    | N/A                                                                                                                                                   |
\ No newline at end of file
+| Field                                                                                                         | Type                                                                                                          | Required                                                                                                      | Description                                                                                                   |
+| ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                              | *String*                                                                                                      | :heavy_check_mark:                                                                                            | The ID of the organization for which to send the invitation                                                   |
+| `requestBody`                                                                                                 | [CreateOrganizationInvitationRequestBody](../../models/operations/CreateOrganizationInvitationRequestBody.md) | :heavy_check_mark:                                                                                            | N/A                                                                                                           |
\ No newline at end of file
diff --git a/docs/models/operations/CreateOrganizationInvitationRequestBody.md b/docs/models/operations/CreateOrganizationInvitationRequestBody.md
index 7e35283..f1074ca 100644
--- a/docs/models/operations/CreateOrganizationInvitationRequestBody.md
+++ b/docs/models/operations/CreateOrganizationInvitationRequestBody.md
@@ -3,11 +3,11 @@
 
 ## Fields
 
-| Field                                                                                                                                                                             | Type                                                                                                                                                                              | Required                                                                                                                                                                          | Description                                                                                                                                                                       |
-| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `emailAddress`                                                                                                                                                                    | *String*                                                                                                                                                                          | :heavy_check_mark:                                                                                                                                                                | The email address of the new member that is going to be invited to the organization                                                                                               |
-| `inviterUserId`                                                                                                                                                                   | *String*                                                                                                                                                                          | :heavy_check_mark:                                                                                                                                                                | The ID of the user that invites the new member to the organization.<br/>Must be an administrator in the organization.                                                             |
-| `role`                                                                                                                                                                            | *String*                                                                                                                                                                          | :heavy_check_mark:                                                                                                                                                                | The role of the new member in the organization                                                                                                                                    |
-| `publicMetadata`                                                                                                                                                                  | [Optional<? extends com.clerk.backend_api.models.operations.CreateOrganizationInvitationPublicMetadata>](../../models/operations/CreateOrganizationInvitationPublicMetadata.md)   | :heavy_minus_sign:                                                                                                                                                                | Metadata saved on the organization invitation, read-only from the Frontend API and fully accessible (read/write) from the Backend API.                                            |
-| `privateMetadata`                                                                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.operations.CreateOrganizationInvitationPrivateMetadata>](../../models/operations/CreateOrganizationInvitationPrivateMetadata.md) | :heavy_minus_sign:                                                                                                                                                                | Metadata saved on the organization invitation, fully accessible (read/write) from the Backend API but not visible from the Frontend API.                                          |
-| `redirectUrl`                                                                                                                                                                     | *Optional<? extends String>*                                                                                                                                                      | :heavy_minus_sign:                                                                                                                                                                | Optional URL that the invitee will be redirected to once they accept the invitation by clicking the join link in the invitation email.                                            |
\ No newline at end of file
+| Field                                                                                                                                    | Type                                                                                                                                     | Required                                                                                                                                 | Description                                                                                                                              |
+| ---------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- |
+| `emailAddress`                                                                                                                           | *String*                                                                                                                                 | :heavy_check_mark:                                                                                                                       | The email address of the new member that is going to be invited to the organization                                                      |
+| `inviterUserId`                                                                                                                          | *String*                                                                                                                                 | :heavy_check_mark:                                                                                                                       | The ID of the user that invites the new member to the organization.<br/>Must be an administrator in the organization.                    |
+| `role`                                                                                                                                   | *String*                                                                                                                                 | :heavy_check_mark:                                                                                                                       | The role of the new member in the organization                                                                                           |
+| `publicMetadata`                                                                                                                         | [Optional<CreateOrganizationInvitationPublicMetadata>](../../models/operations/CreateOrganizationInvitationPublicMetadata.md)            | :heavy_minus_sign:                                                                                                                       | Metadata saved on the organization invitation, read-only from the Frontend API and fully accessible (read/write) from the Backend API.   |
+| `privateMetadata`                                                                                                                        | [Optional<CreateOrganizationInvitationPrivateMetadata>](../../models/operations/CreateOrganizationInvitationPrivateMetadata.md)          | :heavy_minus_sign:                                                                                                                       | Metadata saved on the organization invitation, fully accessible (read/write) from the Backend API but not visible from the Frontend API. |
+| `redirectUrl`                                                                                                                            | *Optional<String>*                                                                                                                       | :heavy_minus_sign:                                                                                                                       | Optional URL that the invitee will be redirected to once they accept the invitation by clicking the join link in the invitation email.   |
\ No newline at end of file
diff --git a/docs/models/operations/CreateOrganizationInvitationResponse.md b/docs/models/operations/CreateOrganizationInvitationResponse.md
index 8b6f9fb..209dfdf 100644
--- a/docs/models/operations/CreateOrganizationInvitationResponse.md
+++ b/docs/models/operations/CreateOrganizationInvitationResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                   | Type                                                                                                                                    | Required                                                                                                                                | Description                                                                                                                             |
-| --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                           | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | HTTP response content type for this operation                                                                                           |
-| `statusCode`                                                                                                                            | *int*                                                                                                                                   | :heavy_check_mark:                                                                                                                      | HTTP response status code for this operation                                                                                            |
-| `rawResponse`                                                                                                                           | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)           | :heavy_check_mark:                                                                                                                      | Raw HTTP response; suitable for custom response parsing                                                                                 |
-| `organizationInvitation`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation>](../../models/components/OrganizationInvitation.md) | :heavy_minus_sign:                                                                                                                      | An organization invitation                                                                                                              |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `organizationInvitation`                                                                                                      | [Optional<OrganizationInvitation>](../../models/components/OrganizationInvitation.md)                                         | :heavy_minus_sign:                                                                                                            | An organization invitation                                                                                                    |
\ No newline at end of file
diff --git a/docs/models/operations/CreateOrganizationMembershipRequest.md b/docs/models/operations/CreateOrganizationMembershipRequest.md
index 8d27eba..acd17c3 100644
--- a/docs/models/operations/CreateOrganizationMembershipRequest.md
+++ b/docs/models/operations/CreateOrganizationMembershipRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                                 | Type                                                                                                                                                  | Required                                                                                                                                              | Description                                                                                                                                           |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                      | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The ID of the organization where the new membership will be created                                                                                   |
-| `requestBody`                                                                                                                                         | [com.clerk.backend_api.models.operations.CreateOrganizationMembershipRequestBody](../../models/operations/CreateOrganizationMembershipRequestBody.md) | :heavy_check_mark:                                                                                                                                    | N/A                                                                                                                                                   |
\ No newline at end of file
+| Field                                                                                                         | Type                                                                                                          | Required                                                                                                      | Description                                                                                                   |
+| ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                              | *String*                                                                                                      | :heavy_check_mark:                                                                                            | The ID of the organization where the new membership will be created                                           |
+| `requestBody`                                                                                                 | [CreateOrganizationMembershipRequestBody](../../models/operations/CreateOrganizationMembershipRequestBody.md) | :heavy_check_mark:                                                                                            | N/A                                                                                                           |
\ No newline at end of file
diff --git a/docs/models/operations/CreateOrganizationMembershipResponse.md b/docs/models/operations/CreateOrganizationMembershipResponse.md
index e2d08cc..3a3295b 100644
--- a/docs/models/operations/CreateOrganizationMembershipResponse.md
+++ b/docs/models/operations/CreateOrganizationMembershipResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                   | Type                                                                                                                                    | Required                                                                                                                                | Description                                                                                                                             |
-| --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                           | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | HTTP response content type for this operation                                                                                           |
-| `statusCode`                                                                                                                            | *int*                                                                                                                                   | :heavy_check_mark:                                                                                                                      | HTTP response status code for this operation                                                                                            |
-| `rawResponse`                                                                                                                           | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)           | :heavy_check_mark:                                                                                                                      | Raw HTTP response; suitable for custom response parsing                                                                                 |
-| `organizationMembership`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership>](../../models/components/OrganizationMembership.md) | :heavy_minus_sign:                                                                                                                      | Success                                                                                                                                 |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `organizationMembership`                                                                                                      | [Optional<OrganizationMembership>](../../models/components/OrganizationMembership.md)                                         | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/CreateOrganizationRequestBody.md b/docs/models/operations/CreateOrganizationRequestBody.md
index 0373d23..6df38c7 100644
--- a/docs/models/operations/CreateOrganizationRequestBody.md
+++ b/docs/models/operations/CreateOrganizationRequestBody.md
@@ -3,11 +3,11 @@
 
 ## Fields
 
-| Field                                                                                                                                                         | Type                                                                                                                                                          | Required                                                                                                                                                      | Description                                                                                                                                                   |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `name`                                                                                                                                                        | *String*                                                                                                                                                      | :heavy_check_mark:                                                                                                                                            | The name of the new organization                                                                                                                              |
-| `createdBy`                                                                                                                                                   | *String*                                                                                                                                                      | :heavy_check_mark:                                                                                                                                            | The ID of the User who will become the administrator for the new organization                                                                                 |
-| `privateMetadata`                                                                                                                                             | [Optional<? extends com.clerk.backend_api.models.operations.CreateOrganizationPrivateMetadata>](../../models/operations/CreateOrganizationPrivateMetadata.md) | :heavy_minus_sign:                                                                                                                                            | Metadata saved on the organization, accessible only from the Backend API                                                                                      |
-| `publicMetadata`                                                                                                                                              | [Optional<? extends com.clerk.backend_api.models.operations.CreateOrganizationPublicMetadata>](../../models/operations/CreateOrganizationPublicMetadata.md)   | :heavy_minus_sign:                                                                                                                                            | Metadata saved on the organization, read-only from the Frontend API and fully accessible (read/write) from the Backend API                                    |
-| `slug`                                                                                                                                                        | *Optional<? extends String>*                                                                                                                                  | :heavy_minus_sign:                                                                                                                                            | A slug for the new organization.<br/>Can contain only lowercase alphanumeric characters and the dash "-".<br/>Must be unique for the instance.                |
-| `maxAllowedMemberships`                                                                                                                                       | *Optional<? extends Long>*                                                                                                                                    | :heavy_minus_sign:                                                                                                                                            | The maximum number of memberships allowed for this organization                                                                                               |
\ No newline at end of file
+| Field                                                                                                                                  | Type                                                                                                                                   | Required                                                                                                                               | Description                                                                                                                            |
+| -------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
+| `name`                                                                                                                                 | *String*                                                                                                                               | :heavy_check_mark:                                                                                                                     | The name of the new organization                                                                                                       |
+| `createdBy`                                                                                                                            | *String*                                                                                                                               | :heavy_check_mark:                                                                                                                     | The ID of the User who will become the administrator for the new organization                                                          |
+| `privateMetadata`                                                                                                                      | [Optional<CreateOrganizationPrivateMetadata>](../../models/operations/CreateOrganizationPrivateMetadata.md)                            | :heavy_minus_sign:                                                                                                                     | Metadata saved on the organization, accessible only from the Backend API                                                               |
+| `publicMetadata`                                                                                                                       | [Optional<CreateOrganizationPublicMetadata>](../../models/operations/CreateOrganizationPublicMetadata.md)                              | :heavy_minus_sign:                                                                                                                     | Metadata saved on the organization, read-only from the Frontend API and fully accessible (read/write) from the Backend API             |
+| `slug`                                                                                                                                 | *Optional<String>*                                                                                                                     | :heavy_minus_sign:                                                                                                                     | A slug for the new organization.<br/>Can contain only lowercase alphanumeric characters and the dash "-".<br/>Must be unique for the instance. |
+| `maxAllowedMemberships`                                                                                                                | *Optional<Long>*                                                                                                                       | :heavy_minus_sign:                                                                                                                     | The maximum number of memberships allowed for this organization                                                                        |
\ No newline at end of file
diff --git a/docs/models/operations/CreateOrganizationResponse.md b/docs/models/operations/CreateOrganizationResponse.md
index 84c9498..9b2f6a7 100644
--- a/docs/models/operations/CreateOrganizationResponse.md
+++ b/docs/models/operations/CreateOrganizationResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `organization`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.Organization>](../../models/components/Organization.md)           | :heavy_minus_sign:                                                                                                            | An organization                                                                                                               |
\ No newline at end of file
+| `organization`                                                                                                                | [Optional<Organization>](../../models/components/Organization.md)                                                             | :heavy_minus_sign:                                                                                                            | An organization                                                                                                               |
\ No newline at end of file
diff --git a/docs/models/operations/CreatePhoneNumberRequestBody.md b/docs/models/operations/CreatePhoneNumberRequestBody.md
index beea2c2..3817227 100644
--- a/docs/models/operations/CreatePhoneNumberRequestBody.md
+++ b/docs/models/operations/CreatePhoneNumberRequestBody.md
@@ -5,8 +5,8 @@
 
 | Field                                                                                                                                                                                                                   | Type                                                                                                                                                                                                                    | Required                                                                                                                                                                                                                | Description                                                                                                                                                                                                             |
 | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `userId`                                                                                                                                                                                                                | *Optional<? extends String>*                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                      | The ID representing the user                                                                                                                                                                                            |
-| `phoneNumber`                                                                                                                                                                                                           | *Optional<? extends String>*                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                      | The new phone number. Must adhere to the E.164 standard for phone number format.                                                                                                                                        |
-| `verified`                                                                                                                                                                                                              | *JsonNullable<? extends Boolean>*                                                                                                                                                                                       | :heavy_minus_sign:                                                                                                                                                                                                      | When created, the phone number will be marked as verified.                                                                                                                                                              |
-| `primary`                                                                                                                                                                                                               | *JsonNullable<? extends Boolean>*                                                                                                                                                                                       | :heavy_minus_sign:                                                                                                                                                                                                      | Create this phone number as the primary phone number for the user.<br/>Default: false, unless it is the first phone number.                                                                                             |
-| `reservedForSecondFactor`                                                                                                                                                                                               | *JsonNullable<? extends Boolean>*                                                                                                                                                                                       | :heavy_minus_sign:                                                                                                                                                                                                      | Create this phone number as reserved for multi-factor authentication.<br/>The phone number must also be verified.<br/>If there are no other reserved second factors, the phone number will be set as the default second factor. |
\ No newline at end of file
+| `userId`                                                                                                                                                                                                                | *Optional<String>*                                                                                                                                                                                                      | :heavy_minus_sign:                                                                                                                                                                                                      | The ID representing the user                                                                                                                                                                                            |
+| `phoneNumber`                                                                                                                                                                                                           | *Optional<String>*                                                                                                                                                                                                      | :heavy_minus_sign:                                                                                                                                                                                                      | The new phone number. Must adhere to the E.164 standard for phone number format.                                                                                                                                        |
+| `verified`                                                                                                                                                                                                              | *JsonNullable<Boolean>*                                                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                                                                      | When created, the phone number will be marked as verified.                                                                                                                                                              |
+| `primary`                                                                                                                                                                                                               | *JsonNullable<Boolean>*                                                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                                                                      | Create this phone number as the primary phone number for the user.<br/>Default: false, unless it is the first phone number.                                                                                             |
+| `reservedForSecondFactor`                                                                                                                                                                                               | *JsonNullable<Boolean>*                                                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                                                                      | Create this phone number as reserved for multi-factor authentication.<br/>The phone number must also be verified.<br/>If there are no other reserved second factors, the phone number will be set as the default second factor. |
\ No newline at end of file
diff --git a/docs/models/operations/CreatePhoneNumberResponse.md b/docs/models/operations/CreatePhoneNumberResponse.md
index df2862b..cff9d44 100644
--- a/docs/models/operations/CreatePhoneNumberResponse.md
+++ b/docs/models/operations/CreatePhoneNumberResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `phoneNumber`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.PhoneNumber>](../../models/components/PhoneNumber.md)             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `phoneNumber`                                                                                                                 | [Optional<PhoneNumber>](../../models/components/PhoneNumber.md)                                                               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/CreateRedirectURLRequestBody.md b/docs/models/operations/CreateRedirectURLRequestBody.md
index f318418..4cf5314 100644
--- a/docs/models/operations/CreateRedirectURLRequestBody.md
+++ b/docs/models/operations/CreateRedirectURLRequestBody.md
@@ -5,4 +5,4 @@
 
 | Field                                                                                                                                    | Type                                                                                                                                     | Required                                                                                                                                 | Description                                                                                                                              |
 | ---------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- |
-| `url`                                                                                                                                    | *Optional<? extends String>*                                                                                                             | :heavy_minus_sign:                                                                                                                       | The full url value prefixed with `https://` or a custom scheme e.g. `"https://my-app.com/oauth-callback"` or `"my-app://oauth-callback"` |
\ No newline at end of file
+| `url`                                                                                                                                    | *Optional<String>*                                                                                                                       | :heavy_minus_sign:                                                                                                                       | The full url value prefixed with `https://` or a custom scheme e.g. `"https://my-app.com/oauth-callback"` or `"my-app://oauth-callback"` |
\ No newline at end of file
diff --git a/docs/models/operations/CreateRedirectURLResponse.md b/docs/models/operations/CreateRedirectURLResponse.md
index 9b771d8..cb02ec9 100644
--- a/docs/models/operations/CreateRedirectURLResponse.md
+++ b/docs/models/operations/CreateRedirectURLResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `redirectURL`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.RedirectURL>](../../models/components/RedirectURL.md)             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `redirectURL`                                                                                                                 | [Optional<RedirectURL>](../../models/components/RedirectURL.md)                                                               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/CreateSAMLConnectionRequestBody.md b/docs/models/operations/CreateSAMLConnectionRequestBody.md
index ee0c77f..b9b9762 100644
--- a/docs/models/operations/CreateSAMLConnectionRequestBody.md
+++ b/docs/models/operations/CreateSAMLConnectionRequestBody.md
@@ -3,14 +3,14 @@
 
 ## Fields
 
-| Field                                                                                                                           | Type                                                                                                                            | Required                                                                                                                        | Description                                                                                                                     |
-| ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
-| `name`                                                                                                                          | *String*                                                                                                                        | :heavy_check_mark:                                                                                                              | The name to use as a label for this SAML Connection                                                                             |
-| `domain`                                                                                                                        | *String*                                                                                                                        | :heavy_check_mark:                                                                                                              | The domain of your organization. Sign in flows using an email with this domain, will use this SAML Connection.                  |
-| `provider`                                                                                                                      | [com.clerk.backend_api.models.operations.Provider](../../models/operations/Provider.md)                                         | :heavy_check_mark:                                                                                                              | The IdP provider of the connection.                                                                                             |
-| `idpEntityId`                                                                                                                   | *JsonNullable<? extends String>*                                                                                                | :heavy_minus_sign:                                                                                                              | The Entity ID as provided by the IdP                                                                                            |
-| `idpSsoUrl`                                                                                                                     | *JsonNullable<? extends String>*                                                                                                | :heavy_minus_sign:                                                                                                              | The Single-Sign On URL as provided by the IdP                                                                                   |
-| `idpCertificate`                                                                                                                | *JsonNullable<? extends String>*                                                                                                | :heavy_minus_sign:                                                                                                              | The X.509 certificate as provided by the IdP                                                                                    |
-| `idpMetadataUrl`                                                                                                                | *JsonNullable<? extends String>*                                                                                                | :heavy_minus_sign:                                                                                                              | The URL which serves the IdP metadata. If present, it takes priority over the corresponding individual properties               |
-| `idpMetadata`                                                                                                                   | *JsonNullable<? extends String>*                                                                                                | :heavy_minus_sign:                                                                                                              | The XML content of the IdP metadata file. If present, it takes priority over the corresponding individual properties            |
-| `attributeMapping`                                                                                                              | [JsonNullable<? extends com.clerk.backend_api.models.operations.AttributeMapping>](../../models/operations/AttributeMapping.md) | :heavy_minus_sign:                                                                                                              | Define the attribute name mapping between Identity Provider and Clerk's user properties                                         |
\ No newline at end of file
+| Field                                                                                                                | Type                                                                                                                 | Required                                                                                                             | Description                                                                                                          |
+| -------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------- |
+| `name`                                                                                                               | *String*                                                                                                             | :heavy_check_mark:                                                                                                   | The name to use as a label for this SAML Connection                                                                  |
+| `domain`                                                                                                             | *String*                                                                                                             | :heavy_check_mark:                                                                                                   | The domain of your organization. Sign in flows using an email with this domain, will use this SAML Connection.       |
+| `provider`                                                                                                           | [Provider](../../models/operations/Provider.md)                                                                      | :heavy_check_mark:                                                                                                   | The IdP provider of the connection.                                                                                  |
+| `idpEntityId`                                                                                                        | *JsonNullable<String>*                                                                                               | :heavy_minus_sign:                                                                                                   | The Entity ID as provided by the IdP                                                                                 |
+| `idpSsoUrl`                                                                                                          | *JsonNullable<String>*                                                                                               | :heavy_minus_sign:                                                                                                   | The Single-Sign On URL as provided by the IdP                                                                        |
+| `idpCertificate`                                                                                                     | *JsonNullable<String>*                                                                                               | :heavy_minus_sign:                                                                                                   | The X.509 certificate as provided by the IdP                                                                         |
+| `idpMetadataUrl`                                                                                                     | *JsonNullable<String>*                                                                                               | :heavy_minus_sign:                                                                                                   | The URL which serves the IdP metadata. If present, it takes priority over the corresponding individual properties    |
+| `idpMetadata`                                                                                                        | *JsonNullable<String>*                                                                                               | :heavy_minus_sign:                                                                                                   | The XML content of the IdP metadata file. If present, it takes priority over the corresponding individual properties |
+| `attributeMapping`                                                                                                   | [JsonNullable<AttributeMapping>](../../models/operations/AttributeMapping.md)                                        | :heavy_minus_sign:                                                                                                   | Define the attribute name mapping between Identity Provider and Clerk's user properties                              |
\ No newline at end of file
diff --git a/docs/models/operations/CreateSAMLConnectionResponse.md b/docs/models/operations/CreateSAMLConnectionResponse.md
index b2ee68f..4df6509 100644
--- a/docs/models/operations/CreateSAMLConnectionResponse.md
+++ b/docs/models/operations/CreateSAMLConnectionResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `samlConnection`                                                                                                              | [Optional<? extends com.clerk.backend_api.models.components.SAMLConnection>](../../models/components/SAMLConnection.md)       | :heavy_minus_sign:                                                                                                            | A SAML Connection                                                                                                             |
\ No newline at end of file
+| `samlConnection`                                                                                                              | [Optional<SAMLConnection>](../../models/components/SAMLConnection.md)                                                         | :heavy_minus_sign:                                                                                                            | A SAML Connection                                                                                                             |
\ No newline at end of file
diff --git a/docs/models/operations/CreateSessionTokenFromTemplateResponse.md b/docs/models/operations/CreateSessionTokenFromTemplateResponse.md
index aec48b3..9755a5d 100644
--- a/docs/models/operations/CreateSessionTokenFromTemplateResponse.md
+++ b/docs/models/operations/CreateSessionTokenFromTemplateResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                                                           | Type                                                                                                                                                                            | Required                                                                                                                                                                        | Description                                                                                                                                                                     |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                                                                   | *String*                                                                                                                                                                        | :heavy_check_mark:                                                                                                                                                              | HTTP response content type for this operation                                                                                                                                   |
-| `statusCode`                                                                                                                                                                    | *int*                                                                                                                                                                           | :heavy_check_mark:                                                                                                                                                              | HTTP response status code for this operation                                                                                                                                    |
-| `rawResponse`                                                                                                                                                                   | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)                                                   | :heavy_check_mark:                                                                                                                                                              | Raw HTTP response; suitable for custom response parsing                                                                                                                         |
-| `object`                                                                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateResponseBody>](../../models/operations/CreateSessionTokenFromTemplateResponseBody.md) | :heavy_minus_sign:                                                                                                                                                              | OK                                                                                                                                                                              |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `object`                                                                                                                      | [Optional<CreateSessionTokenFromTemplateResponseBody>](../../models/operations/CreateSessionTokenFromTemplateResponseBody.md) | :heavy_minus_sign:                                                                                                            | OK                                                                                                                            |
\ No newline at end of file
diff --git a/docs/models/operations/CreateSessionTokenFromTemplateResponseBody.md b/docs/models/operations/CreateSessionTokenFromTemplateResponseBody.md
index 620952f..5198c66 100644
--- a/docs/models/operations/CreateSessionTokenFromTemplateResponseBody.md
+++ b/docs/models/operations/CreateSessionTokenFromTemplateResponseBody.md
@@ -5,7 +5,7 @@ OK
 
 ## Fields
 
-| Field                                                                                                   | Type                                                                                                    | Required                                                                                                | Description                                                                                             |
-| ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                | [Optional<? extends com.clerk.backend_api.models.operations.Object>](../../models/operations/Object.md) | :heavy_minus_sign:                                                                                      | N/A                                                                                                     |
-| `jwt`                                                                                                   | *Optional<? extends String>*                                                                            | :heavy_minus_sign:                                                                                      | N/A                                                                                                     |
\ No newline at end of file
+| Field                                                 | Type                                                  | Required                                              | Description                                           |
+| ----------------------------------------------------- | ----------------------------------------------------- | ----------------------------------------------------- | ----------------------------------------------------- |
+| `object`                                              | [Optional<Object>](../../models/operations/Object.md) | :heavy_minus_sign:                                    | N/A                                                   |
+| `jwt`                                                 | *Optional<String>*                                    | :heavy_minus_sign:                                    | N/A                                                   |
\ No newline at end of file
diff --git a/docs/models/operations/CreateSignInTokenRequestBody.md b/docs/models/operations/CreateSignInTokenRequestBody.md
index 4639d10..9c57c07 100644
--- a/docs/models/operations/CreateSignInTokenRequestBody.md
+++ b/docs/models/operations/CreateSignInTokenRequestBody.md
@@ -5,5 +5,5 @@
 
 | Field                                                                                                                 | Type                                                                                                                  | Required                                                                                                              | Description                                                                                                           |
 | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- |
-| `userId`                                                                                                              | *Optional<? extends String>*                                                                                          | :heavy_minus_sign:                                                                                                    | The ID of the user that can use the newly created sign in token                                                       |
-| `expiresInSeconds`                                                                                                    | *Optional<? extends Long>*                                                                                            | :heavy_minus_sign:                                                                                                    | Optional parameter to specify the life duration of the sign in token in seconds.<br/>By default, the duration is 30 days. |
\ No newline at end of file
+| `userId`                                                                                                              | *Optional<String>*                                                                                                    | :heavy_minus_sign:                                                                                                    | The ID of the user that can use the newly created sign in token                                                       |
+| `expiresInSeconds`                                                                                                    | *Optional<Long>*                                                                                                      | :heavy_minus_sign:                                                                                                    | Optional parameter to specify the life duration of the sign in token in seconds.<br/>By default, the duration is 30 days. |
\ No newline at end of file
diff --git a/docs/models/operations/CreateSignInTokenResponse.md b/docs/models/operations/CreateSignInTokenResponse.md
index 2cbc428..7bff320 100644
--- a/docs/models/operations/CreateSignInTokenResponse.md
+++ b/docs/models/operations/CreateSignInTokenResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `signInToken`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.SignInToken>](../../models/components/SignInToken.md)             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `signInToken`                                                                                                                 | [Optional<SignInToken>](../../models/components/SignInToken.md)                                                               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/CreateSvixAppResponse.md b/docs/models/operations/CreateSvixAppResponse.md
index 1b63e3e..bfc1f7a 100644
--- a/docs/models/operations/CreateSvixAppResponse.md
+++ b/docs/models/operations/CreateSvixAppResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `svixURL`                                                                                                                     | [Optional<? extends com.clerk.backend_api.models.components.SvixURL>](../../models/components/SvixURL.md)                     | :heavy_minus_sign:                                                                                                            | Response that contains a temporary Svix URL to access management dashboard                                                    |
\ No newline at end of file
+| `svixURL`                                                                                                                     | [Optional<SvixURL>](../../models/components/SvixURL.md)                                                                       | :heavy_minus_sign:                                                                                                            | Response that contains a temporary Svix URL to access management dashboard                                                    |
\ No newline at end of file
diff --git a/docs/models/operations/CreateTestingTokenResponse.md b/docs/models/operations/CreateTestingTokenResponse.md
index 246ba0f..8636e08 100644
--- a/docs/models/operations/CreateTestingTokenResponse.md
+++ b/docs/models/operations/CreateTestingTokenResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `testingToken`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.TestingToken>](../../models/components/TestingToken.md)           | :heavy_minus_sign:                                                                                                            | A Testing Token                                                                                                               |
\ No newline at end of file
+| `testingToken`                                                                                                                | [Optional<TestingToken>](../../models/components/TestingToken.md)                                                             | :heavy_minus_sign:                                                                                                            | A Testing Token                                                                                                               |
\ No newline at end of file
diff --git a/docs/models/operations/CreateUserRequestBody.md b/docs/models/operations/CreateUserRequestBody.md
index ca2617c..3a62267 100644
--- a/docs/models/operations/CreateUserRequestBody.md
+++ b/docs/models/operations/CreateUserRequestBody.md
@@ -5,21 +5,21 @@
 
 | Field                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | Type                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | Required                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `externalId`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | The ID of the user as used in your external systems or your previous authentication solution.<br/>Must be unique across your instance.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| `firstName`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | The first name to assign to the user                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `lastName`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | The last name to assign to the user                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| `externalId`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | The ID of the user as used in your external systems or your previous authentication solution.<br/>Must be unique across your instance.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| `firstName`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | The first name to assign to the user                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| `lastName`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | The last name to assign to the user                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | `emailAddress`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | List<*String*>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Email addresses to add to the user.<br/>Must be unique across your instance.<br/>The first email address will be set as the user's primary email address.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | `phoneNumber`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | List<*String*>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Phone numbers to add to the user.<br/>Must be unique across your instance.<br/>The first phone number will be set as the user's primary phone number.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | `web3Wallet`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | List<*String*>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Web3 wallets to add to the user.<br/>Must be unique across your instance.<br/>The first wallet will be set as the user's primary wallet.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| `username`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | The username to give to the user.<br/>It must be unique across your instance.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| `password`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | The plaintext password to give the user.<br/>Must be at least 8 characters long, and can not be in any list of hacked passwords.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `passwordDigest`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | *Optional<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | In case you already have the password digests and not the passwords, you can use them for the newly created user via this property.<br/>The digests should be generated with one of the supported algorithms.<br/>The hashing algorithm can be specified using the `password_hasher` property.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| `passwordHasher`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | [Optional<? extends com.clerk.backend_api.models.operations.PasswordHasher>](../../models/operations/PasswordHasher.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | The hashing algorithm that was used to generate the password digest.<br/>The algorithms we support at the moment are [bcrypt](https://en.wikipedia.org/wiki/Bcrypt), [bcrypt_sha256_django](https://docs.djangoproject.com/en/4.0/topics/auth/passwords/),<br/>[md5](https://en.wikipedia.org/wiki/MD5), pbkdf2_sha256, pbkdf2_sha512, [pbkdf2_sha256_django](https://docs.djangoproject.com/en/4.0/topics/auth/passwords/),<br/>[phpass](https://www.openwall.com/phpass/), [scrypt_firebase](https://firebaseopensource.com/projects/firebase/scrypt/),<br/>[scrypt_werkzeug](https://werkzeug.palletsprojects.com/en/3.0.x/utils/#werkzeug.security.generate_password_hash), [sha256](https://en.wikipedia.org/wiki/SHA-2)<br/>and the [argon2](https://argon2.online/) variants argon2i and argon2id.<br/><br/>If you need support for any particular hashing algorithm, [please let us know](https://clerk.com/support).<br/><br/>Note: for password hashers considered insecure (at this moment MD5 and SHA256), the corresponding user password hashes will be transparently migrated to Bcrypt (a secure hasher) upon the user's first successful password sign in.<br/>Insecure schemes are marked with `(insecure)` in the list below.<br/><br/>Each of the supported hashers expects the incoming digest to be in a particular format. Specifically:<br/><br/>**bcrypt:** The digest should be of the following form:<br/><br/>`$<algorithm version>$<cost>$<salt & hash>`<br/><br/>**bcrypt_sha256_django:** This is the Django-specific variant of Bcrypt, using SHA256 hashing function. The format should be as follows (as exported from Django):<br/><br/>`bcrypt_sha256$$<algorithm version>$<cost>$<salt & hash>`<br/><br/>**md5** (insecure): The digest should follow the regular form e.g.:<br/><br/>`5f4dcc3b5aa765d61d8327deb882cf99`<br/><br/>**pbkdf2_sha256:** This is the PBKDF2 algorithm using the SHA256 hashing function. The format should be as follows:<br/><br/>`pbkdf2_sha256$<iterations>$<salt>$<hash>`<br/><br/>Note: Both the salt and the hash are expected to be base64-encoded.<br/><br/>**pbkdf2_sha512:** This is the PBKDF2 algorithm using the SHA512 hashing function. The format should be as follows:<br/><br/>`pbkdf2_sha512$<iterations>$<salt>$<hash>`<br/><br/>  _iterations:_ The number of iterations used. Must be an integer less than 420000.<br/>  _salt:_ The salt used when generating the hash. Must be less than 1024 bytes.<br/>  _hash:_ The hex-encoded hash. Must have been generated with a key length less than 1024 bytes.<br/><br/>**pbkdf2_sha256_django:** This is the Django-specific variant of PBKDF2 and the digest should have the following format (as exported from Django):<br/><br/>`pbkdf2_sha256$<iterations>$<salt>$<hash>`<br/><br/>Note: The salt is expected to be un-encoded, the hash is expected base64-encoded.<br/><br/>**pbkdf2_sha1:** This is similar to pkbdf2_sha256_django, but with two differences:<br/>1. uses sha1 instead of sha256<br/>2. accepts the hash as a hex-encoded string<br/><br/>The format is the following:<br/><br/>`pbkdf2_sha1$<iterations>$<salt>$<hash-as-hex-string>`<br/><br/>**phpass:** Portable public domain password hashing framework for use in PHP applications. Digests hashed with phpass have the following sections:<br/><br/>The format is the following:<br/><br/>`$P$<rounds><salt><encoded-checksum>`<br/><br/>- $P$ is the prefix used to identify phpass hashes.<br/>- rounds is a single character encoding a 6-bit integer representing the number of rounds used.<br/>- salt is eight characters drawn from [./0-9A-Za-z], providing a 48-bit salt.<br/>- checksum is 22 characters drawn from the same set, encoding the 128-bit checksum with MD5.<br/><br/>**scrypt_firebase:** The Firebase-specific variant of scrypt.<br/>The value is expected to have 6 segments separated by the $ character and include the following information:<br/><br/>_hash:_ The actual Base64 hash. This can be retrieved when exporting the user from Firebase.<br/>_salt:_ The salt used to generate the above hash. Again, this is given when exporting the user.<br/>_signer key:_ The base64 encoded signer key.<br/>_salt separator:_ The base64 encoded salt separator.<br/>_rounds:_ The number of rounds the algorithm needs to run.<br/>_memory cost:_ The cost of the algorithm run<br/><br/>The first 2 (hash and salt) are per user and can be retrieved when exporting the user from Firebase.<br/>The other 4 values (signer key, salt separator, rounds and memory cost) are project-wide settings and can be retrieved from the project's password hash parameters.<br/><br/>Once you have all these, you can combine it in the following format and send this as the digest in order for Clerk to accept it:<br/><br/>`<hash>$<salt>$<signer key>$<salt separator>$<rounds>$<memory cost>`<br/><br/>**scrypt_werkzeug:** The Werkzeug-specific variant of scrypt.<br/><br/>  The value is expected to have 3 segments separated by the $ character and include the following information:<br/><br/>  _algorithm args:_ The algorithm used to generate the hash.<br/>  _salt:_ The salt used to generate the above hash.<br/>  _hash:_ The actual Base64 hash.<br/><br/>  The algorithm args are the parameters used to generate the hash and are included in the digest.<br/><br/>**argon2i:** Algorithms in the argon2 family generate digests that encode the following information:<br/><br/>_version (v):_ The argon version, version 19 is assumed<br/>_memory (m):_ The memory used by the algorithm (in kibibytes)<br/>_iterations (t):_ The number of iterations to perform<br/>_parallelism (p):_ The number of threads to use<br/><br/>Parts are demarcated by the `$` character, with the first part identifying the algorithm variant.<br/>The middle part is a comma-separated list of the encoding options (memory, iterations, parallelism).<br/>The final part is the actual digest.<br/><br/>`$argon2i$v=19$m=4096,t=3,p=1$4t6CL3P7YiHBtwESXawI8Hm20zJj4cs7/4/G3c187e0$m7RQFczcKr5bIR0IIxbpO2P0tyrLjf3eUW3M3QSwnLc`<br/><br/>**argon2id:** See the previous algorithm for an explanation of the formatting.<br/><br/>For the argon2id case, the value of the algorithm in the first part of the digest is `argon2id`:<br/><br/>`$argon2id$v=19$m=64,t=4,p=8$Z2liZXJyaXNo$iGXEpMBTDYQ8G/71tF0qGjxRHEmR3gpGULcE93zUJVU`<br/><br/>**sha256** (insecure): The digest should be a 64-length hex string, e.g.:<br/><br/>`9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08`<br/><br/>**sha256_salted** (insecure): The digest should be a 64-length hex string with a salt.<br/><br/>The format is the following:<br/>  `<hash>$<salt>`  <br/><br/>The value is expected to have 2 segments separated by the $ character and include the following information:<br/>  _hash:_ The sha256 hash, a 64-length hex string.<br/>  _salt:_ The salt used to generate the above hash. Must be between 1 and 1024 bits. |
-| `skipPasswordChecks`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | *Optional<? extends Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | When set to `true` all password checks are skipped.<br/>It is recommended to use this method only when migrating plaintext passwords to Clerk.<br/>Upon migration the user base should be prompted to pick stronger password.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| `skipPasswordRequirement`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | *Optional<? extends Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | When set to `true`, `password` is not required anymore when creating the user and can be omitted.<br/>This is useful when you are trying to create a user that doesn't have a password, in an instance that is using passwords.<br/>Please note that you cannot use this flag if password is the only way for a user to sign into your instance.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `totpSecret`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | *Optional<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | In case TOTP is configured on the instance, you can provide the secret to enable it on the newly created user without the need to reset it.<br/>Please note that currently the supported options are:<br/>* Period: 30 seconds<br/>* Code length: 6 digits<br/>* Algorithm: SHA1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| `username`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | The username to give to the user.<br/>It must be unique across your instance.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| `password`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | The plaintext password to give the user.<br/>Must be at least 8 characters long, and can not be in any list of hacked passwords.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| `passwordDigest`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | *Optional<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | In case you already have the password digests and not the passwords, you can use them for the newly created user via this property.<br/>The digests should be generated with one of the supported algorithms.<br/>The hashing algorithm can be specified using the `password_hasher` property.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| `passwordHasher`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | [Optional<PasswordHasher>](../../models/operations/PasswordHasher.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | The hashing algorithm that was used to generate the password digest.<br/>The algorithms we support at the moment are [bcrypt](https://en.wikipedia.org/wiki/Bcrypt), [bcrypt_sha256_django](https://docs.djangoproject.com/en/4.0/topics/auth/passwords/),<br/>[md5](https://en.wikipedia.org/wiki/MD5), pbkdf2_sha256, pbkdf2_sha512, [pbkdf2_sha256_django](https://docs.djangoproject.com/en/4.0/topics/auth/passwords/),<br/>[phpass](https://www.openwall.com/phpass/), [scrypt_firebase](https://firebaseopensource.com/projects/firebase/scrypt/),<br/>[scrypt_werkzeug](https://werkzeug.palletsprojects.com/en/3.0.x/utils/#werkzeug.security.generate_password_hash), [sha256](https://en.wikipedia.org/wiki/SHA-2)<br/>and the [argon2](https://argon2.online/) variants argon2i and argon2id.<br/><br/>If you need support for any particular hashing algorithm, [please let us know](https://clerk.com/support).<br/><br/>Note: for password hashers considered insecure (at this moment MD5 and SHA256), the corresponding user password hashes will be transparently migrated to Bcrypt (a secure hasher) upon the user's first successful password sign in.<br/>Insecure schemes are marked with `(insecure)` in the list below.<br/><br/>Each of the supported hashers expects the incoming digest to be in a particular format. Specifically:<br/><br/>**bcrypt:** The digest should be of the following form:<br/><br/>`$<algorithm version>$<cost>$<salt & hash>`<br/><br/>**bcrypt_sha256_django:** This is the Django-specific variant of Bcrypt, using SHA256 hashing function. The format should be as follows (as exported from Django):<br/><br/>`bcrypt_sha256$$<algorithm version>$<cost>$<salt & hash>`<br/><br/>**md5** (insecure): The digest should follow the regular form e.g.:<br/><br/>`5f4dcc3b5aa765d61d8327deb882cf99`<br/><br/>**pbkdf2_sha256:** This is the PBKDF2 algorithm using the SHA256 hashing function. The format should be as follows:<br/><br/>`pbkdf2_sha256$<iterations>$<salt>$<hash>`<br/><br/>Note: Both the salt and the hash are expected to be base64-encoded.<br/><br/>**pbkdf2_sha512:** This is the PBKDF2 algorithm using the SHA512 hashing function. The format should be as follows:<br/><br/>`pbkdf2_sha512$<iterations>$<salt>$<hash>`<br/><br/>  _iterations:_ The number of iterations used. Must be an integer less than 420000.<br/>  _salt:_ The salt used when generating the hash. Must be less than 1024 bytes.<br/>  _hash:_ The hex-encoded hash. Must have been generated with a key length less than 1024 bytes.<br/><br/>**pbkdf2_sha256_django:** This is the Django-specific variant of PBKDF2 and the digest should have the following format (as exported from Django):<br/><br/>`pbkdf2_sha256$<iterations>$<salt>$<hash>`<br/><br/>Note: The salt is expected to be un-encoded, the hash is expected base64-encoded.<br/><br/>**pbkdf2_sha1:** This is similar to pkbdf2_sha256_django, but with two differences:<br/>1. uses sha1 instead of sha256<br/>2. accepts the hash as a hex-encoded string<br/><br/>The format is the following:<br/><br/>`pbkdf2_sha1$<iterations>$<salt>$<hash-as-hex-string>`<br/><br/>**phpass:** Portable public domain password hashing framework for use in PHP applications. Digests hashed with phpass have the following sections:<br/><br/>The format is the following:<br/><br/>`$P$<rounds><salt><encoded-checksum>`<br/><br/>- $P$ is the prefix used to identify phpass hashes.<br/>- rounds is a single character encoding a 6-bit integer representing the number of rounds used.<br/>- salt is eight characters drawn from [./0-9A-Za-z], providing a 48-bit salt.<br/>- checksum is 22 characters drawn from the same set, encoding the 128-bit checksum with MD5.<br/><br/>**scrypt_firebase:** The Firebase-specific variant of scrypt.<br/>The value is expected to have 6 segments separated by the $ character and include the following information:<br/><br/>_hash:_ The actual Base64 hash. This can be retrieved when exporting the user from Firebase.<br/>_salt:_ The salt used to generate the above hash. Again, this is given when exporting the user.<br/>_signer key:_ The base64 encoded signer key.<br/>_salt separator:_ The base64 encoded salt separator.<br/>_rounds:_ The number of rounds the algorithm needs to run.<br/>_memory cost:_ The cost of the algorithm run<br/><br/>The first 2 (hash and salt) are per user and can be retrieved when exporting the user from Firebase.<br/>The other 4 values (signer key, salt separator, rounds and memory cost) are project-wide settings and can be retrieved from the project's password hash parameters.<br/><br/>Once you have all these, you can combine it in the following format and send this as the digest in order for Clerk to accept it:<br/><br/>`<hash>$<salt>$<signer key>$<salt separator>$<rounds>$<memory cost>`<br/><br/>**scrypt_werkzeug:** The Werkzeug-specific variant of scrypt.<br/><br/>  The value is expected to have 3 segments separated by the $ character and include the following information:<br/><br/>  _algorithm args:_ The algorithm used to generate the hash.<br/>  _salt:_ The salt used to generate the above hash.<br/>  _hash:_ The actual Base64 hash.<br/><br/>  The algorithm args are the parameters used to generate the hash and are included in the digest.<br/><br/>**argon2i:** Algorithms in the argon2 family generate digests that encode the following information:<br/><br/>_version (v):_ The argon version, version 19 is assumed<br/>_memory (m):_ The memory used by the algorithm (in kibibytes)<br/>_iterations (t):_ The number of iterations to perform<br/>_parallelism (p):_ The number of threads to use<br/><br/>Parts are demarcated by the `$` character, with the first part identifying the algorithm variant.<br/>The middle part is a comma-separated list of the encoding options (memory, iterations, parallelism).<br/>The final part is the actual digest.<br/><br/>`$argon2i$v=19$m=4096,t=3,p=1$4t6CL3P7YiHBtwESXawI8Hm20zJj4cs7/4/G3c187e0$m7RQFczcKr5bIR0IIxbpO2P0tyrLjf3eUW3M3QSwnLc`<br/><br/>**argon2id:** See the previous algorithm for an explanation of the formatting.<br/><br/>For the argon2id case, the value of the algorithm in the first part of the digest is `argon2id`:<br/><br/>`$argon2id$v=19$m=64,t=4,p=8$Z2liZXJyaXNo$iGXEpMBTDYQ8G/71tF0qGjxRHEmR3gpGULcE93zUJVU`<br/><br/>**sha256** (insecure): The digest should be a 64-length hex string, e.g.:<br/><br/>`9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08`<br/><br/>**sha256_salted** (insecure): The digest should be a 64-length hex string with a salt.<br/><br/>The format is the following:<br/>  `<hash>$<salt>`  <br/><br/>The value is expected to have 2 segments separated by the $ character and include the following information:<br/>  _hash:_ The sha256 hash, a 64-length hex string.<br/>  _salt:_ The salt used to generate the above hash. Must be between 1 and 1024 bits. |
+| `skipPasswordChecks`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | *Optional<Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | When set to `true` all password checks are skipped.<br/>It is recommended to use this method only when migrating plaintext passwords to Clerk.<br/>Upon migration the user base should be prompted to pick stronger password.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| `skipPasswordRequirement`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | *Optional<Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | When set to `true`, `password` is not required anymore when creating the user and can be omitted.<br/>This is useful when you are trying to create a user that doesn't have a password, in an instance that is using passwords.<br/>Please note that you cannot use this flag if password is the only way for a user to sign into your instance.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| `totpSecret`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | *Optional<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | In case TOTP is configured on the instance, you can provide the secret to enable it on the newly created user without the need to reset it.<br/>Please note that currently the supported options are:<br/>* Period: 30 seconds<br/>* Code length: 6 digits<br/>* Algorithm: SHA1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
 | `backupCodes`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | List<*String*>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | If Backup Codes are configured on the instance, you can provide them to enable it on the newly created user without the need to reset them.<br/>You must provide the backup codes in plain format or the corresponding bcrypt digest.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `publicMetadata`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | [Optional<? extends com.clerk.backend_api.models.operations.PublicMetadata>](../../models/operations/PublicMetadata.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Metadata saved on the user, that is visible to both your Frontend and Backend APIs                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `privateMetadata`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | [Optional<? extends com.clerk.backend_api.models.operations.PrivateMetadata>](../../models/operations/PrivateMetadata.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Metadata saved on the user, that is only visible to your Backend API                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `unsafeMetadata`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | [Optional<? extends com.clerk.backend_api.models.operations.UnsafeMetadata>](../../models/operations/UnsafeMetadata.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Metadata saved on the user, that can be updated from both the Frontend and Backend APIs.<br/>Note: Since this data can be modified from the frontend, it is not guaranteed to be safe.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| `createdAt`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | *Optional<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | A custom date/time denoting _when_ the user signed up to the application, specified in RFC3339 format (e.g. `2012-10-20T07:15:20.902Z`).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
\ No newline at end of file
+| `publicMetadata`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | [Optional<PublicMetadata>](../../models/operations/PublicMetadata.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Metadata saved on the user, that is visible to both your Frontend and Backend APIs                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+| `privateMetadata`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | [Optional<PrivateMetadata>](../../models/operations/PrivateMetadata.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Metadata saved on the user, that is only visible to your Backend API                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| `unsafeMetadata`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | [Optional<UnsafeMetadata>](../../models/operations/UnsafeMetadata.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Metadata saved on the user, that can be updated from both the Frontend and Backend APIs.<br/>Note: Since this data can be modified from the frontend, it is not guaranteed to be safe.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| `createdAt`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | *Optional<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | A custom date/time denoting _when_ the user signed up to the application, specified in RFC3339 format (e.g. `2012-10-20T07:15:20.902Z`).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
\ No newline at end of file
diff --git a/docs/models/operations/CreateUserResponse.md b/docs/models/operations/CreateUserResponse.md
index 69f963b..f030da2 100644
--- a/docs/models/operations/CreateUserResponse.md
+++ b/docs/models/operations/CreateUserResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `user`                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.components.User>](../../models/components/User.md)                           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `user`                                                                                                                        | [Optional<User>](../../models/components/User.md)                                                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/DeleteAllowlistIdentifierResponse.md b/docs/models/operations/DeleteAllowlistIdentifierResponse.md
index 8f66574..2437c7d 100644
--- a/docs/models/operations/DeleteAllowlistIdentifierResponse.md
+++ b/docs/models/operations/DeleteAllowlistIdentifierResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `deletedObject`                                                                                                               | [Optional<? extends com.clerk.backend_api.models.components.DeletedObject>](../../models/components/DeletedObject.md)         | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
+| `deletedObject`                                                                                                               | [Optional<DeletedObject>](../../models/components/DeletedObject.md)                                                           | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
diff --git a/docs/models/operations/DeleteBlocklistIdentifierResponse.md b/docs/models/operations/DeleteBlocklistIdentifierResponse.md
index 2d2a858..c088a5c 100644
--- a/docs/models/operations/DeleteBlocklistIdentifierResponse.md
+++ b/docs/models/operations/DeleteBlocklistIdentifierResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `deletedObject`                                                                                                               | [Optional<? extends com.clerk.backend_api.models.components.DeletedObject>](../../models/components/DeletedObject.md)         | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
+| `deletedObject`                                                                                                               | [Optional<DeletedObject>](../../models/components/DeletedObject.md)                                                           | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
diff --git a/docs/models/operations/DeleteDomainResponse.md b/docs/models/operations/DeleteDomainResponse.md
index 45f963e..783281c 100644
--- a/docs/models/operations/DeleteDomainResponse.md
+++ b/docs/models/operations/DeleteDomainResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `deletedObject`                                                                                                               | [Optional<? extends com.clerk.backend_api.models.components.DeletedObject>](../../models/components/DeletedObject.md)         | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
+| `deletedObject`                                                                                                               | [Optional<DeletedObject>](../../models/components/DeletedObject.md)                                                           | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
diff --git a/docs/models/operations/DeleteEmailAddressResponse.md b/docs/models/operations/DeleteEmailAddressResponse.md
index e0d6fff..afb0389 100644
--- a/docs/models/operations/DeleteEmailAddressResponse.md
+++ b/docs/models/operations/DeleteEmailAddressResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `deletedObject`                                                                                                               | [Optional<? extends com.clerk.backend_api.models.components.DeletedObject>](../../models/components/DeletedObject.md)         | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
+| `deletedObject`                                                                                                               | [Optional<DeletedObject>](../../models/components/DeletedObject.md)                                                           | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
diff --git a/docs/models/operations/DeleteJWTTemplateResponse.md b/docs/models/operations/DeleteJWTTemplateResponse.md
index a6644fd..483c226 100644
--- a/docs/models/operations/DeleteJWTTemplateResponse.md
+++ b/docs/models/operations/DeleteJWTTemplateResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `deletedObject`                                                                                                               | [Optional<? extends com.clerk.backend_api.models.components.DeletedObject>](../../models/components/DeletedObject.md)         | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
+| `deletedObject`                                                                                                               | [Optional<DeletedObject>](../../models/components/DeletedObject.md)                                                           | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
diff --git a/docs/models/operations/DeleteOAuthApplicationResponse.md b/docs/models/operations/DeleteOAuthApplicationResponse.md
index 371d244..d1396ae 100644
--- a/docs/models/operations/DeleteOAuthApplicationResponse.md
+++ b/docs/models/operations/DeleteOAuthApplicationResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `deletedObject`                                                                                                               | [Optional<? extends com.clerk.backend_api.models.components.DeletedObject>](../../models/components/DeletedObject.md)         | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
+| `deletedObject`                                                                                                               | [Optional<DeletedObject>](../../models/components/DeletedObject.md)                                                           | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
diff --git a/docs/models/operations/DeleteOrganizationLogoResponse.md b/docs/models/operations/DeleteOrganizationLogoResponse.md
index 78a574a..442ba51 100644
--- a/docs/models/operations/DeleteOrganizationLogoResponse.md
+++ b/docs/models/operations/DeleteOrganizationLogoResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `organization`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.Organization>](../../models/components/Organization.md)           | :heavy_minus_sign:                                                                                                            | An organization                                                                                                               |
\ No newline at end of file
+| `organization`                                                                                                                | [Optional<Organization>](../../models/components/Organization.md)                                                             | :heavy_minus_sign:                                                                                                            | An organization                                                                                                               |
\ No newline at end of file
diff --git a/docs/models/operations/DeleteOrganizationMembershipResponse.md b/docs/models/operations/DeleteOrganizationMembershipResponse.md
index 8403169..9857f0b 100644
--- a/docs/models/operations/DeleteOrganizationMembershipResponse.md
+++ b/docs/models/operations/DeleteOrganizationMembershipResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                   | Type                                                                                                                                    | Required                                                                                                                                | Description                                                                                                                             |
-| --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                           | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | HTTP response content type for this operation                                                                                           |
-| `statusCode`                                                                                                                            | *int*                                                                                                                                   | :heavy_check_mark:                                                                                                                      | HTTP response status code for this operation                                                                                            |
-| `rawResponse`                                                                                                                           | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)           | :heavy_check_mark:                                                                                                                      | Raw HTTP response; suitable for custom response parsing                                                                                 |
-| `organizationMembership`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership>](../../models/components/OrganizationMembership.md) | :heavy_minus_sign:                                                                                                                      | Success                                                                                                                                 |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `organizationMembership`                                                                                                      | [Optional<OrganizationMembership>](../../models/components/OrganizationMembership.md)                                         | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/DeleteOrganizationResponse.md b/docs/models/operations/DeleteOrganizationResponse.md
index 92c15cb..e90f6f7 100644
--- a/docs/models/operations/DeleteOrganizationResponse.md
+++ b/docs/models/operations/DeleteOrganizationResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `deletedObject`                                                                                                               | [Optional<? extends com.clerk.backend_api.models.components.DeletedObject>](../../models/components/DeletedObject.md)         | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
+| `deletedObject`                                                                                                               | [Optional<DeletedObject>](../../models/components/DeletedObject.md)                                                           | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
diff --git a/docs/models/operations/DeletePhoneNumberResponse.md b/docs/models/operations/DeletePhoneNumberResponse.md
index 85b58b2..0d5a275 100644
--- a/docs/models/operations/DeletePhoneNumberResponse.md
+++ b/docs/models/operations/DeletePhoneNumberResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `deletedObject`                                                                                                               | [Optional<? extends com.clerk.backend_api.models.components.DeletedObject>](../../models/components/DeletedObject.md)         | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
+| `deletedObject`                                                                                                               | [Optional<DeletedObject>](../../models/components/DeletedObject.md)                                                           | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
diff --git a/docs/models/operations/DeleteRedirectURLResponse.md b/docs/models/operations/DeleteRedirectURLResponse.md
index 18204d6..1c5ec8a 100644
--- a/docs/models/operations/DeleteRedirectURLResponse.md
+++ b/docs/models/operations/DeleteRedirectURLResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `deletedObject`                                                                                                               | [Optional<? extends com.clerk.backend_api.models.components.DeletedObject>](../../models/components/DeletedObject.md)         | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
+| `deletedObject`                                                                                                               | [Optional<DeletedObject>](../../models/components/DeletedObject.md)                                                           | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
diff --git a/docs/models/operations/DeleteSAMLConnectionResponse.md b/docs/models/operations/DeleteSAMLConnectionResponse.md
index b0c2105..7b51e1e 100644
--- a/docs/models/operations/DeleteSAMLConnectionResponse.md
+++ b/docs/models/operations/DeleteSAMLConnectionResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `deletedObject`                                                                                                               | [Optional<? extends com.clerk.backend_api.models.components.DeletedObject>](../../models/components/DeletedObject.md)         | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
+| `deletedObject`                                                                                                               | [Optional<DeletedObject>](../../models/components/DeletedObject.md)                                                           | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
diff --git a/docs/models/operations/DeleteUserProfileImageResponse.md b/docs/models/operations/DeleteUserProfileImageResponse.md
index c98f1b1..b28ac97 100644
--- a/docs/models/operations/DeleteUserProfileImageResponse.md
+++ b/docs/models/operations/DeleteUserProfileImageResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `user`                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.components.User>](../../models/components/User.md)                           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `user`                                                                                                                        | [Optional<User>](../../models/components/User.md)                                                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/DeleteUserResponse.md b/docs/models/operations/DeleteUserResponse.md
index c856514..f85df3b 100644
--- a/docs/models/operations/DeleteUserResponse.md
+++ b/docs/models/operations/DeleteUserResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `deletedObject`                                                                                                               | [Optional<? extends com.clerk.backend_api.models.components.DeletedObject>](../../models/components/DeletedObject.md)         | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
+| `deletedObject`                                                                                                               | [Optional<DeletedObject>](../../models/components/DeletedObject.md)                                                           | :heavy_minus_sign:                                                                                                            | Deleted Object                                                                                                                |
\ No newline at end of file
diff --git a/docs/models/operations/DisableMFAResponse.md b/docs/models/operations/DisableMFAResponse.md
index a38cd11..3e49c56 100644
--- a/docs/models/operations/DisableMFAResponse.md
+++ b/docs/models/operations/DisableMFAResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                   | Type                                                                                                                                    | Required                                                                                                                                | Description                                                                                                                             |
-| --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                           | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | HTTP response content type for this operation                                                                                           |
-| `statusCode`                                                                                                                            | *int*                                                                                                                                   | :heavy_check_mark:                                                                                                                      | HTTP response status code for this operation                                                                                            |
-| `rawResponse`                                                                                                                           | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)           | :heavy_check_mark:                                                                                                                      | Raw HTTP response; suitable for custom response parsing                                                                                 |
-| `object`                                                                                                                                | [Optional<? extends com.clerk.backend_api.models.operations.DisableMFAResponseBody>](../../models/operations/DisableMFAResponseBody.md) | :heavy_minus_sign:                                                                                                                      | Successful operation.                                                                                                                   |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `object`                                                                                                                      | [Optional<DisableMFAResponseBody>](../../models/operations/DisableMFAResponseBody.md)                                         | :heavy_minus_sign:                                                                                                            | Successful operation.                                                                                                         |
\ No newline at end of file
diff --git a/docs/models/operations/DisableMFAResponseBody.md b/docs/models/operations/DisableMFAResponseBody.md
index 51cea15..518e505 100644
--- a/docs/models/operations/DisableMFAResponseBody.md
+++ b/docs/models/operations/DisableMFAResponseBody.md
@@ -5,6 +5,6 @@ Successful operation.
 
 ## Fields
 
-| Field                        | Type                         | Required                     | Description                  |
-| ---------------------------- | ---------------------------- | ---------------------------- | ---------------------------- |
-| `userId`                     | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
\ No newline at end of file
+| Field              | Type               | Required           | Description        |
+| ------------------ | ------------------ | ------------------ | ------------------ |
+| `userId`           | *Optional<String>* | :heavy_minus_sign: | N/A                |
\ No newline at end of file
diff --git a/docs/models/operations/GenerateSvixAuthURLResponse.md b/docs/models/operations/GenerateSvixAuthURLResponse.md
index 5a3360f..290e36e 100644
--- a/docs/models/operations/GenerateSvixAuthURLResponse.md
+++ b/docs/models/operations/GenerateSvixAuthURLResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `svixURL`                                                                                                                     | [Optional<? extends com.clerk.backend_api.models.components.SvixURL>](../../models/components/SvixURL.md)                     | :heavy_minus_sign:                                                                                                            | Response that contains a temporary Svix URL to access management dashboard                                                    |
\ No newline at end of file
+| `svixURL`                                                                                                                     | [Optional<SvixURL>](../../models/components/SvixURL.md)                                                                       | :heavy_minus_sign:                                                                                                            | Response that contains a temporary Svix URL to access management dashboard                                                    |
\ No newline at end of file
diff --git a/docs/models/operations/GetClientListRequest.md b/docs/models/operations/GetClientListRequest.md
index 12d725b..e9677dc 100644
--- a/docs/models/operations/GetClientListRequest.md
+++ b/docs/models/operations/GetClientListRequest.md
@@ -5,5 +5,5 @@
 
 | Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `limit`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
-| `offset`                                                                                                                                  | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
\ No newline at end of file
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
\ No newline at end of file
diff --git a/docs/models/operations/GetClientListResponse.md b/docs/models/operations/GetClientListResponse.md
index 0be48b6..663b019 100644
--- a/docs/models/operations/GetClientListResponse.md
+++ b/docs/models/operations/GetClientListResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `clientList`                                                                                                                  | List<[com.clerk.backend_api.models.components.Client](../../models/components/Client.md)>                                     | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `clientList`                                                                                                                  | List<[Client](../../models/components/Client.md)>                                                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/GetClientResponse.md b/docs/models/operations/GetClientResponse.md
index 37cdd9e..2e91e41 100644
--- a/docs/models/operations/GetClientResponse.md
+++ b/docs/models/operations/GetClientResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `client`                                                                                                                      | [Optional<? extends com.clerk.backend_api.models.components.Client>](../../models/components/Client.md)                       | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `client`                                                                                                                      | [Optional<Client>](../../models/components/Client.md)                                                                         | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/GetEmailAddressResponse.md b/docs/models/operations/GetEmailAddressResponse.md
index a3fe442..d284d02 100644
--- a/docs/models/operations/GetEmailAddressResponse.md
+++ b/docs/models/operations/GetEmailAddressResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `emailAddress`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.EmailAddress>](../../models/components/EmailAddress.md)           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `emailAddress`                                                                                                                | [Optional<EmailAddress>](../../models/components/EmailAddress.md)                                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/GetJWTTemplateResponse.md b/docs/models/operations/GetJWTTemplateResponse.md
index c2f16d0..be6b029 100644
--- a/docs/models/operations/GetJWTTemplateResponse.md
+++ b/docs/models/operations/GetJWTTemplateResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `jwtTemplate`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.JWTTemplate>](../../models/components/JWTTemplate.md)             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `jwtTemplate`                                                                                                                 | [Optional<JWTTemplate>](../../models/components/JWTTemplate.md)                                                               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/GetOAuthAccessTokenResponse.md b/docs/models/operations/GetOAuthAccessTokenResponse.md
index c785f2c..2402520 100644
--- a/docs/models/operations/GetOAuthAccessTokenResponse.md
+++ b/docs/models/operations/GetOAuthAccessTokenResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `responseBodies`                                                                                                              | List<[com.clerk.backend_api.models.operations.ResponseBody](../../models/operations/ResponseBody.md)>                         | :heavy_minus_sign:                                                                                                            | The OAuth access token of the user, if any.                                                                                   |
\ No newline at end of file
+| `responseBodies`                                                                                                              | List<[ResponseBody](../../models/operations/ResponseBody.md)>                                                                 | :heavy_minus_sign:                                                                                                            | The OAuth access token of the user, if any.                                                                                   |
\ No newline at end of file
diff --git a/docs/models/operations/GetOAuthApplicationResponse.md b/docs/models/operations/GetOAuthApplicationResponse.md
index 60980a9..5c3d64a 100644
--- a/docs/models/operations/GetOAuthApplicationResponse.md
+++ b/docs/models/operations/GetOAuthApplicationResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `oAuthApplication`                                                                                                            | [Optional<? extends com.clerk.backend_api.models.components.OAuthApplication>](../../models/components/OAuthApplication.md)   | :heavy_minus_sign:                                                                                                            | An OAuth application                                                                                                          |
\ No newline at end of file
+| `oAuthApplication`                                                                                                            | [Optional<OAuthApplication>](../../models/components/OAuthApplication.md)                                                     | :heavy_minus_sign:                                                                                                            | An OAuth application                                                                                                          |
\ No newline at end of file
diff --git a/docs/models/operations/GetOrganizationInvitationResponse.md b/docs/models/operations/GetOrganizationInvitationResponse.md
index 73cc33b..beed689 100644
--- a/docs/models/operations/GetOrganizationInvitationResponse.md
+++ b/docs/models/operations/GetOrganizationInvitationResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                   | Type                                                                                                                                    | Required                                                                                                                                | Description                                                                                                                             |
-| --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                           | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | HTTP response content type for this operation                                                                                           |
-| `statusCode`                                                                                                                            | *int*                                                                                                                                   | :heavy_check_mark:                                                                                                                      | HTTP response status code for this operation                                                                                            |
-| `rawResponse`                                                                                                                           | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)           | :heavy_check_mark:                                                                                                                      | Raw HTTP response; suitable for custom response parsing                                                                                 |
-| `organizationInvitation`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation>](../../models/components/OrganizationInvitation.md) | :heavy_minus_sign:                                                                                                                      | An organization invitation                                                                                                              |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `organizationInvitation`                                                                                                      | [Optional<OrganizationInvitation>](../../models/components/OrganizationInvitation.md)                                         | :heavy_minus_sign:                                                                                                            | An organization invitation                                                                                                    |
\ No newline at end of file
diff --git a/docs/models/operations/GetOrganizationResponse.md b/docs/models/operations/GetOrganizationResponse.md
index 8a30447..f251eab 100644
--- a/docs/models/operations/GetOrganizationResponse.md
+++ b/docs/models/operations/GetOrganizationResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `organization`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.Organization>](../../models/components/Organization.md)           | :heavy_minus_sign:                                                                                                            | An organization                                                                                                               |
\ No newline at end of file
+| `organization`                                                                                                                | [Optional<Organization>](../../models/components/Organization.md)                                                             | :heavy_minus_sign:                                                                                                            | An organization                                                                                                               |
\ No newline at end of file
diff --git a/docs/models/operations/GetPhoneNumberResponse.md b/docs/models/operations/GetPhoneNumberResponse.md
index f32c45c..8400501 100644
--- a/docs/models/operations/GetPhoneNumberResponse.md
+++ b/docs/models/operations/GetPhoneNumberResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `phoneNumber`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.PhoneNumber>](../../models/components/PhoneNumber.md)             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `phoneNumber`                                                                                                                 | [Optional<PhoneNumber>](../../models/components/PhoneNumber.md)                                                               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/GetPublicInterstitialRequest.md b/docs/models/operations/GetPublicInterstitialRequest.md
index 4a14c6f..c59da8c 100644
--- a/docs/models/operations/GetPublicInterstitialRequest.md
+++ b/docs/models/operations/GetPublicInterstitialRequest.md
@@ -5,5 +5,5 @@
 
 | Field                                 | Type                                  | Required                              | Description                           |
 | ------------------------------------- | ------------------------------------- | ------------------------------------- | ------------------------------------- |
-| `frontendApi`                         | *Optional<? extends String>*          | :heavy_minus_sign:                    | The Frontend API key of your instance |
-| `publishableKey`                      | *Optional<? extends String>*          | :heavy_minus_sign:                    | The publishable key of your instance  |
\ No newline at end of file
+| `frontendApi`                         | *Optional<String>*                    | :heavy_minus_sign:                    | The Frontend API key of your instance |
+| `publishableKey`                      | *Optional<String>*                    | :heavy_minus_sign:                    | The publishable key of your instance  |
\ No newline at end of file
diff --git a/docs/models/operations/GetRedirectURLResponse.md b/docs/models/operations/GetRedirectURLResponse.md
index 66eab5a..98678a8 100644
--- a/docs/models/operations/GetRedirectURLResponse.md
+++ b/docs/models/operations/GetRedirectURLResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `redirectURL`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.RedirectURL>](../../models/components/RedirectURL.md)             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `redirectURL`                                                                                                                 | [Optional<RedirectURL>](../../models/components/RedirectURL.md)                                                               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/GetSAMLConnectionResponse.md b/docs/models/operations/GetSAMLConnectionResponse.md
index d35aca2..a5ff7d5 100644
--- a/docs/models/operations/GetSAMLConnectionResponse.md
+++ b/docs/models/operations/GetSAMLConnectionResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `samlConnection`                                                                                                              | [Optional<? extends com.clerk.backend_api.models.components.SAMLConnection>](../../models/components/SAMLConnection.md)       | :heavy_minus_sign:                                                                                                            | A SAML Connection                                                                                                             |
\ No newline at end of file
+| `samlConnection`                                                                                                              | [Optional<SAMLConnection>](../../models/components/SAMLConnection.md)                                                         | :heavy_minus_sign:                                                                                                            | A SAML Connection                                                                                                             |
\ No newline at end of file
diff --git a/docs/models/operations/GetSessionListRequest.md b/docs/models/operations/GetSessionListRequest.md
index 7faf1cd..f2e72ee 100644
--- a/docs/models/operations/GetSessionListRequest.md
+++ b/docs/models/operations/GetSessionListRequest.md
@@ -5,8 +5,8 @@
 
 | Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `clientId`                                                                                                                                | *Optional<? extends String>*                                                                                                              | :heavy_minus_sign:                                                                                                                        | List sessions for the given client                                                                                                        |
-| `userId`                                                                                                                                  | *Optional<? extends String>*                                                                                                              | :heavy_minus_sign:                                                                                                                        | List sessions for the given user                                                                                                          |
-| `status`                                                                                                                                  | [Optional<? extends com.clerk.backend_api.models.operations.Status>](../../models/operations/Status.md)                                   | :heavy_minus_sign:                                                                                                                        | Filter sessions by the provided status                                                                                                    |
-| `limit`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
-| `offset`                                                                                                                                  | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
\ No newline at end of file
+| `clientId`                                                                                                                                | *Optional<String>*                                                                                                                        | :heavy_minus_sign:                                                                                                                        | List sessions for the given client                                                                                                        |
+| `userId`                                                                                                                                  | *Optional<String>*                                                                                                                        | :heavy_minus_sign:                                                                                                                        | List sessions for the given user                                                                                                          |
+| `status`                                                                                                                                  | [Optional<Status>](../../models/operations/Status.md)                                                                                     | :heavy_minus_sign:                                                                                                                        | Filter sessions by the provided status                                                                                                    |
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
\ No newline at end of file
diff --git a/docs/models/operations/GetSessionListResponse.md b/docs/models/operations/GetSessionListResponse.md
index d892d20..adf4fd4 100644
--- a/docs/models/operations/GetSessionListResponse.md
+++ b/docs/models/operations/GetSessionListResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `sessionList`                                                                                                                 | List<[com.clerk.backend_api.models.components.Session](../../models/components/Session.md)>                                   | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `sessionList`                                                                                                                 | List<[Session](../../models/components/Session.md)>                                                                           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/GetSessionResponse.md b/docs/models/operations/GetSessionResponse.md
index 477ad70..026fc3f 100644
--- a/docs/models/operations/GetSessionResponse.md
+++ b/docs/models/operations/GetSessionResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `session`                                                                                                                     | [Optional<? extends com.clerk.backend_api.models.components.Session>](../../models/components/Session.md)                     | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `session`                                                                                                                     | [Optional<Session>](../../models/components/Session.md)                                                                       | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/GetTemplateListRequest.md b/docs/models/operations/GetTemplateListRequest.md
index cd5fed0..301e0f4 100644
--- a/docs/models/operations/GetTemplateListRequest.md
+++ b/docs/models/operations/GetTemplateListRequest.md
@@ -3,6 +3,6 @@
 
 ## Fields
 
-| Field                                                                                           | Type                                                                                            | Required                                                                                        | Description                                                                                     |
-| ----------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- |
-| `templateType`                                                                                  | [com.clerk.backend_api.models.operations.TemplateType](../../models/operations/TemplateType.md) | :heavy_check_mark:                                                                              | The type of templates to list (email or SMS)                                                    |
\ No newline at end of file
+| Field                                                   | Type                                                    | Required                                                | Description                                             |
+| ------------------------------------------------------- | ------------------------------------------------------- | ------------------------------------------------------- | ------------------------------------------------------- |
+| `templateType`                                          | [TemplateType](../../models/operations/TemplateType.md) | :heavy_check_mark:                                      | The type of templates to list (email or SMS)            |
\ No newline at end of file
diff --git a/docs/models/operations/GetTemplateListResponse.md b/docs/models/operations/GetTemplateListResponse.md
index da950a7..a085702 100644
--- a/docs/models/operations/GetTemplateListResponse.md
+++ b/docs/models/operations/GetTemplateListResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `templateList`                                                                                                                | List<[com.clerk.backend_api.models.components.Template](../../models/components/Template.md)>                                 | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `templateList`                                                                                                                | List<[Template](../../models/components/Template.md)>                                                                         | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/GetTemplateRequest.md b/docs/models/operations/GetTemplateRequest.md
index 7aad703..83c3011 100644
--- a/docs/models/operations/GetTemplateRequest.md
+++ b/docs/models/operations/GetTemplateRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                             | Type                                                                                                              | Required                                                                                                          | Description                                                                                                       |
-| ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
-| `templateType`                                                                                                    | [com.clerk.backend_api.models.operations.PathParamTemplateType](../../models/operations/PathParamTemplateType.md) | :heavy_check_mark:                                                                                                | The type of templates to retrieve (email or SMS)                                                                  |
-| `slug`                                                                                                            | *String*                                                                                                          | :heavy_check_mark:                                                                                                | The slug (i.e. machine-friendly name) of the template to retrieve                                                 |
\ No newline at end of file
+| Field                                                                     | Type                                                                      | Required                                                                  | Description                                                               |
+| ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- |
+| `templateType`                                                            | [PathParamTemplateType](../../models/operations/PathParamTemplateType.md) | :heavy_check_mark:                                                        | The type of templates to retrieve (email or SMS)                          |
+| `slug`                                                                    | *String*                                                                  | :heavy_check_mark:                                                        | The slug (i.e. machine-friendly name) of the template to retrieve         |
\ No newline at end of file
diff --git a/docs/models/operations/GetTemplateResponse.md b/docs/models/operations/GetTemplateResponse.md
index 8bef704..9162903 100644
--- a/docs/models/operations/GetTemplateResponse.md
+++ b/docs/models/operations/GetTemplateResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `template`                                                                                                                    | [Optional<? extends com.clerk.backend_api.models.components.Template>](../../models/components/Template.md)                   | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `template`                                                                                                                    | [Optional<Template>](../../models/components/Template.md)                                                                     | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/GetUserListRequest.md b/docs/models/operations/GetUserListRequest.md
index 8e6ec31..5a9d18c 100644
--- a/docs/models/operations/GetUserListRequest.md
+++ b/docs/models/operations/GetUserListRequest.md
@@ -12,8 +12,8 @@
 | `web3Wallet`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | List<*String*>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Returns users with the specified web3 wallet addresses.<br/>Accepts up to 100 web3 wallet addresses.<br/>Any web3 wallet addressed not found are ignored.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | `userId`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | List<*String*>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Returns users with the user ids specified.<br/>For each user id, the `+` and `-` can be<br/>prepended to the id, which denote whether the<br/>respective user id should be included or<br/>excluded from the result set.<br/>Accepts up to 100 user ids.<br/>Any user ids not found are ignored.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | `organizationId`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | List<*String*>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Returns users that have memberships to the<br/>given organizations.<br/>For each organization id, the `+` and `-` can be<br/>prepended to the id, which denote whether the<br/>respective organization should be included or<br/>excluded from the result set.<br/>Accepts up to 100 organization ids.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| `query`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | *Optional<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Returns users that match the given query.<br/>For possible matches, we check the email addresses, phone numbers, usernames, web3 wallets, user ids, first and last names.<br/>The query value doesn't need to match the exact value you are looking for, it is capable of partial matches as well.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| `lastActiveAtSince`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | *Optional<? extends Long>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Returns users that had session activity since the given date, with day precision.<br/>Providing a value with higher precision than day will result in an error.<br/>Example: use 1700690400000 to retrieve users that had session activity from 2023-11-23 until the current day.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | 1700690400000                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| `limit`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | *Optional<? extends Long>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| `offset`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | *Optional<? extends Long>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| `orderBy`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | *Optional<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Allows to return users in a particular order.<br/>At the moment, you can order the returned users by their `created_at`,`updated_at`,`email_address`,`web3wallet`,`first_name`,`last_name`,`phone_number`,`username`,`last_active_at`,`last_sign_in_at`.<br/>In order to specify the direction, you can use the `+/-` symbols prepended in the property to order by.<br/>For example, if you want users to be returned in descending order according to their `created_at` property, you can use `-created_at`.<br/>If you don't use `+` or `-`, then `+` is implied. We only support one `order_by` parameter, and if multiple `order_by` parameters are provided, we will only keep the first one. For example,<br/>if you pass `order_by=username&order_by=created_at`, we will consider only the first `order_by` parameter, which is `username`. The `created_at` parameter will be ignored in this case. |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
\ No newline at end of file
+| `query`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | *Optional<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Returns users that match the given query.<br/>For possible matches, we check the email addresses, phone numbers, usernames, web3 wallets, user ids, first and last names.<br/>The query value doesn't need to match the exact value you are looking for, it is capable of partial matches as well.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| `lastActiveAtSince`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | *Optional<Long>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Returns users that had session activity since the given date, with day precision.<br/>Providing a value with higher precision than day will result in an error.<br/>Example: use 1700690400000 to retrieve users that had session activity from 2023-11-23 until the current day.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | 1700690400000                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| `limit`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | *Optional<Long>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| `offset`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | *Optional<Long>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| `orderBy`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | *Optional<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Allows to return users in a particular order.<br/>At the moment, you can order the returned users by their `created_at`,`updated_at`,`email_address`,`web3wallet`,`first_name`,`last_name`,`phone_number`,`username`,`last_active_at`,`last_sign_in_at`.<br/>In order to specify the direction, you can use the `+/-` symbols prepended in the property to order by.<br/>For example, if you want users to be returned in descending order according to their `created_at` property, you can use `-created_at`.<br/>If you don't use `+` or `-`, then `+` is implied. We only support one `order_by` parameter, and if multiple `order_by` parameters are provided, we will only keep the first one. For example,<br/>if you pass `order_by=username&order_by=created_at`, we will consider only the first `order_by` parameter, which is `username`. The `created_at` parameter will be ignored in this case. |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
\ No newline at end of file
diff --git a/docs/models/operations/GetUserListResponse.md b/docs/models/operations/GetUserListResponse.md
index f840600..0a6e76c 100644
--- a/docs/models/operations/GetUserListResponse.md
+++ b/docs/models/operations/GetUserListResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `userList`                                                                                                                    | List<[com.clerk.backend_api.models.components.User](../../models/components/User.md)>                                         | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `userList`                                                                                                                    | List<[User](../../models/components/User.md)>                                                                                 | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/GetUserResponse.md b/docs/models/operations/GetUserResponse.md
index f8079cd..f4c835e 100644
--- a/docs/models/operations/GetUserResponse.md
+++ b/docs/models/operations/GetUserResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `user`                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.components.User>](../../models/components/User.md)                           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `user`                                                                                                                        | [Optional<User>](../../models/components/User.md)                                                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/GetUsersCountRequest.md b/docs/models/operations/GetUsersCountRequest.md
index 1a9cd66..325d36b 100644
--- a/docs/models/operations/GetUsersCountRequest.md
+++ b/docs/models/operations/GetUsersCountRequest.md
@@ -11,4 +11,4 @@
 | `username`                                                                                                                                                                                                                                                                                | List<*String*>                                                                                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                                                                                        | Counts users with the specified usernames.<br/>Accepts up to 100 usernames.<br/>Any usernames not found are ignored.                                                                                                                                                                      |
 | `web3Wallet`                                                                                                                                                                                                                                                                              | List<*String*>                                                                                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                                                                                        | Counts users with the specified web3 wallet addresses.<br/>Accepts up to 100 web3 wallet addresses.<br/>Any web3 wallet addressed not found are ignored.                                                                                                                                  |
 | `userId`                                                                                                                                                                                                                                                                                  | List<*String*>                                                                                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                                                                                        | Counts users with the user ids specified.<br/>Accepts up to 100 user ids.<br/>Any user ids not found are ignored.                                                                                                                                                                         |
-| `query`                                                                                                                                                                                                                                                                                   | *Optional<? extends String>*                                                                                                                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                                                                                                                        | Counts users that match the given query.<br/>For possible matches, we check the email addresses, phone numbers, usernames, web3 wallets, user ids, first and last names.<br/>The query value doesn't need to match the exact value you are looking for, it is capable of partial matches as well. |
\ No newline at end of file
+| `query`                                                                                                                                                                                                                                                                                   | *Optional<String>*                                                                                                                                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                                                                                                                        | Counts users that match the given query.<br/>For possible matches, we check the email addresses, phone numbers, usernames, web3 wallets, user ids, first and last names.<br/>The query value doesn't need to match the exact value you are looking for, it is capable of partial matches as well. |
\ No newline at end of file
diff --git a/docs/models/operations/GetUsersCountResponse.md b/docs/models/operations/GetUsersCountResponse.md
index 27a4eaa..dd16e2d 100644
--- a/docs/models/operations/GetUsersCountResponse.md
+++ b/docs/models/operations/GetUsersCountResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `totalCount`                                                                                                                  | [Optional<? extends com.clerk.backend_api.models.components.TotalCount>](../../models/components/TotalCount.md)               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `totalCount`                                                                                                                  | [Optional<TotalCount>](../../models/components/TotalCount.md)                                                                 | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/ListAllowlistIdentifiersResponse.md b/docs/models/operations/ListAllowlistIdentifiersResponse.md
index 2264a79..8f68752 100644
--- a/docs/models/operations/ListAllowlistIdentifiersResponse.md
+++ b/docs/models/operations/ListAllowlistIdentifiersResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `allowlistIdentifierList`                                                                                                     | List<[com.clerk.backend_api.models.components.AllowlistIdentifier](../../models/components/AllowlistIdentifier.md)>           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `allowlistIdentifierList`                                                                                                     | List<[AllowlistIdentifier](../../models/components/AllowlistIdentifier.md)>                                                   | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/ListBlocklistIdentifiersResponse.md b/docs/models/operations/ListBlocklistIdentifiersResponse.md
index b09ad77..40354a6 100644
--- a/docs/models/operations/ListBlocklistIdentifiersResponse.md
+++ b/docs/models/operations/ListBlocklistIdentifiersResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                               | Type                                                                                                                                | Required                                                                                                                            | Description                                                                                                                         |
-| ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                       | *String*                                                                                                                            | :heavy_check_mark:                                                                                                                  | HTTP response content type for this operation                                                                                       |
-| `statusCode`                                                                                                                        | *int*                                                                                                                               | :heavy_check_mark:                                                                                                                  | HTTP response status code for this operation                                                                                        |
-| `rawResponse`                                                                                                                       | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)       | :heavy_check_mark:                                                                                                                  | Raw HTTP response; suitable for custom response parsing                                                                             |
-| `blocklistIdentifiers`                                                                                                              | [Optional<? extends com.clerk.backend_api.models.components.BlocklistIdentifiers>](../../models/components/BlocklistIdentifiers.md) | :heavy_minus_sign:                                                                                                                  | Success                                                                                                                             |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `blocklistIdentifiers`                                                                                                        | [Optional<BlocklistIdentifiers>](../../models/components/BlocklistIdentifiers.md)                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/ListDomainsResponse.md b/docs/models/operations/ListDomainsResponse.md
index 3df6af3..22b39c8 100644
--- a/docs/models/operations/ListDomainsResponse.md
+++ b/docs/models/operations/ListDomainsResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `domains`                                                                                                                     | [Optional<? extends com.clerk.backend_api.models.components.Domains>](../../models/components/Domains.md)                     | :heavy_minus_sign:                                                                                                            | A list of domains                                                                                                             |
\ No newline at end of file
+| `domains`                                                                                                                     | [Optional<Domains>](../../models/components/Domains.md)                                                                       | :heavy_minus_sign:                                                                                                            | A list of domains                                                                                                             |
\ No newline at end of file
diff --git a/docs/models/operations/ListInvitationsRequest.md b/docs/models/operations/ListInvitationsRequest.md
index 009e0d2..9b61369 100644
--- a/docs/models/operations/ListInvitationsRequest.md
+++ b/docs/models/operations/ListInvitationsRequest.md
@@ -5,6 +5,6 @@
 
 | Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `limit`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
-| `offset`                                                                                                                                  | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
-| `status`                                                                                                                                  | [Optional<? extends com.clerk.backend_api.models.operations.QueryParamStatus>](../../models/operations/QueryParamStatus.md)               | :heavy_minus_sign:                                                                                                                        | Filter invitations based on their status                                                                                                  |
\ No newline at end of file
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
+| `status`                                                                                                                                  | [Optional<QueryParamStatus>](../../models/operations/QueryParamStatus.md)                                                                 | :heavy_minus_sign:                                                                                                                        | Filter invitations based on their status                                                                                                  |
\ No newline at end of file
diff --git a/docs/models/operations/ListInvitationsResponse.md b/docs/models/operations/ListInvitationsResponse.md
index 5faeb6d..4ef1cb3 100644
--- a/docs/models/operations/ListInvitationsResponse.md
+++ b/docs/models/operations/ListInvitationsResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `invitationList`                                                                                                              | List<[com.clerk.backend_api.models.components.Invitation](../../models/components/Invitation.md)>                             | :heavy_minus_sign:                                                                                                            | List of invitations                                                                                                           |
\ No newline at end of file
+| `invitationList`                                                                                                              | List<[Invitation](../../models/components/Invitation.md)>                                                                     | :heavy_minus_sign:                                                                                                            | List of invitations                                                                                                           |
\ No newline at end of file
diff --git a/docs/models/operations/ListJWTTemplatesResponse.md b/docs/models/operations/ListJWTTemplatesResponse.md
index 684668f..153084c 100644
--- a/docs/models/operations/ListJWTTemplatesResponse.md
+++ b/docs/models/operations/ListJWTTemplatesResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `jwtTemplateList`                                                                                                             | List<[com.clerk.backend_api.models.components.JWTTemplate](../../models/components/JWTTemplate.md)>                           | :heavy_minus_sign:                                                                                                            | List of JWT templates                                                                                                         |
\ No newline at end of file
+| `jwtTemplateList`                                                                                                             | List<[JWTTemplate](../../models/components/JWTTemplate.md)>                                                                   | :heavy_minus_sign:                                                                                                            | List of JWT templates                                                                                                         |
\ No newline at end of file
diff --git a/docs/models/operations/ListOAuthApplicationsRequest.md b/docs/models/operations/ListOAuthApplicationsRequest.md
index 3c92eb4..f70a9af 100644
--- a/docs/models/operations/ListOAuthApplicationsRequest.md
+++ b/docs/models/operations/ListOAuthApplicationsRequest.md
@@ -5,5 +5,5 @@
 
 | Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `limit`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
-| `offset`                                                                                                                                  | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
\ No newline at end of file
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
\ No newline at end of file
diff --git a/docs/models/operations/ListOAuthApplicationsResponse.md b/docs/models/operations/ListOAuthApplicationsResponse.md
index ddc6916..4e0e480 100644
--- a/docs/models/operations/ListOAuthApplicationsResponse.md
+++ b/docs/models/operations/ListOAuthApplicationsResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `oAuthApplications`                                                                                                           | [Optional<? extends com.clerk.backend_api.models.components.OAuthApplications>](../../models/components/OAuthApplications.md) | :heavy_minus_sign:                                                                                                            | A list of OAuth applications                                                                                                  |
\ No newline at end of file
+| `oAuthApplications`                                                                                                           | [Optional<OAuthApplications>](../../models/components/OAuthApplications.md)                                                   | :heavy_minus_sign:                                                                                                            | A list of OAuth applications                                                                                                  |
\ No newline at end of file
diff --git a/docs/models/operations/ListOrganizationInvitationsRequest.md b/docs/models/operations/ListOrganizationInvitationsRequest.md
index f815917..66af031 100644
--- a/docs/models/operations/ListOrganizationInvitationsRequest.md
+++ b/docs/models/operations/ListOrganizationInvitationsRequest.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                                                             | Type                                                                                                                                                                              | Required                                                                                                                                                                          | Description                                                                                                                                                                       |
-| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                                                  | *String*                                                                                                                                                                          | :heavy_check_mark:                                                                                                                                                                | The organization ID.                                                                                                                                                              |
-| `limit`                                                                                                                                                                           | *Optional<? extends Long>*                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                                                             |
-| `offset`                                                                                                                                                                          | *Optional<? extends Long>*                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`.                                 |
-| `status`                                                                                                                                                                          | [Optional<? extends com.clerk.backend_api.models.operations.ListOrganizationInvitationsQueryParamStatus>](../../models/operations/ListOrganizationInvitationsQueryParamStatus.md) | :heavy_minus_sign:                                                                                                                                                                | Filter organization invitations based on their status                                                                                                                             |
\ No newline at end of file
+| Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
+| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                                                          | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | The organization ID.                                                                                                                      |
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
+| `status`                                                                                                                                  | [Optional<ListOrganizationInvitationsQueryParamStatus>](../../models/operations/ListOrganizationInvitationsQueryParamStatus.md)           | :heavy_minus_sign:                                                                                                                        | Filter organization invitations based on their status                                                                                     |
\ No newline at end of file
diff --git a/docs/models/operations/ListOrganizationInvitationsResponse.md b/docs/models/operations/ListOrganizationInvitationsResponse.md
index fd468c0..89a4deb 100644
--- a/docs/models/operations/ListOrganizationInvitationsResponse.md
+++ b/docs/models/operations/ListOrganizationInvitationsResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
-| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                             | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | HTTP response content type for this operation                                                                                             |
-| `statusCode`                                                                                                                              | *int*                                                                                                                                     | :heavy_check_mark:                                                                                                                        | HTTP response status code for this operation                                                                                              |
-| `rawResponse`                                                                                                                             | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)             | :heavy_check_mark:                                                                                                                        | Raw HTTP response; suitable for custom response parsing                                                                                   |
-| `organizationInvitations`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations>](../../models/components/OrganizationInvitations.md) | :heavy_minus_sign:                                                                                                                        | A list of organization invitations                                                                                                        |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `organizationInvitations`                                                                                                     | [Optional<OrganizationInvitations>](../../models/components/OrganizationInvitations.md)                                       | :heavy_minus_sign:                                                                                                            | A list of organization invitations                                                                                            |
\ No newline at end of file
diff --git a/docs/models/operations/ListOrganizationMembershipsRequest.md b/docs/models/operations/ListOrganizationMembershipsRequest.md
index 00ef74e..c0e99b4 100644
--- a/docs/models/operations/ListOrganizationMembershipsRequest.md
+++ b/docs/models/operations/ListOrganizationMembershipsRequest.md
@@ -6,6 +6,6 @@
 | Field                                                                                                                                                                                                                               | Type                                                                                                                                                                                                                                | Required                                                                                                                                                                                                                            | Description                                                                                                                                                                                                                         |
 | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `organizationId`                                                                                                                                                                                                                    | *String*                                                                                                                                                                                                                            | :heavy_check_mark:                                                                                                                                                                                                                  | The organization ID.                                                                                                                                                                                                                |
-| `limit`                                                                                                                                                                                                                             | *Optional<? extends Long>*                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                                  | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                                                                                                               |
-| `offset`                                                                                                                                                                                                                            | *Optional<? extends Long>*                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                                  | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`.                                                                                   |
-| `orderBy`                                                                                                                                                                                                                           | *Optional<? extends String>*                                                                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                                                                  | Sorts organizations memberships by phone_number, email_address, created_at, first_name, last_name or username.<br/>By prepending one of those values with + or -,<br/>we can choose to sort in ascending (ASC) or descending (DESC) order." |
\ No newline at end of file
+| `limit`                                                                                                                                                                                                                             | *Optional<Long>*                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                  | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                                                                                                               |
+| `offset`                                                                                                                                                                                                                            | *Optional<Long>*                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                  | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`.                                                                                   |
+| `orderBy`                                                                                                                                                                                                                           | *Optional<String>*                                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                  | Sorts organizations memberships by phone_number, email_address, created_at, first_name, last_name or username.<br/>By prepending one of those values with + or -,<br/>we can choose to sort in ascending (ASC) or descending (DESC) order." |
\ No newline at end of file
diff --git a/docs/models/operations/ListOrganizationMembershipsResponse.md b/docs/models/operations/ListOrganizationMembershipsResponse.md
index f0ddaee..345fef2 100644
--- a/docs/models/operations/ListOrganizationMembershipsResponse.md
+++ b/docs/models/operations/ListOrganizationMembershipsResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
-| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                             | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | HTTP response content type for this operation                                                                                             |
-| `statusCode`                                                                                                                              | *int*                                                                                                                                     | :heavy_check_mark:                                                                                                                        | HTTP response status code for this operation                                                                                              |
-| `rawResponse`                                                                                                                             | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)             | :heavy_check_mark:                                                                                                                        | Raw HTTP response; suitable for custom response parsing                                                                                   |
-| `organizationMemberships`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.OrganizationMemberships>](../../models/components/OrganizationMemberships.md) | :heavy_minus_sign:                                                                                                                        | A list of organization memberships                                                                                                        |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `organizationMemberships`                                                                                                     | [Optional<OrganizationMemberships>](../../models/components/OrganizationMemberships.md)                                       | :heavy_minus_sign:                                                                                                            | A list of organization memberships                                                                                            |
\ No newline at end of file
diff --git a/docs/models/operations/ListOrganizationsRequest.md b/docs/models/operations/ListOrganizationsRequest.md
index 8a19a83..a523e5b 100644
--- a/docs/models/operations/ListOrganizationsRequest.md
+++ b/docs/models/operations/ListOrganizationsRequest.md
@@ -5,8 +5,8 @@
 
 | Field                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | Type                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Required                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `limit`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | *Optional<? extends Long>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                                                                                                                                                                                                                                                                                                                                                                                      |
-| `offset`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | *Optional<? extends Long>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`.                                                                                                                                                                                                                                                                                                                                                          |
-| `includeMembersCount`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | *Optional<? extends Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Flag to denote whether the member counts of each organization should be included in the response or not.                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `query`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | *Optional<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Returns organizations with ID, name, or slug that match the given query.<br/>Uses exact match for organization ID and partial match for name and slug.                                                                                                                                                                                                                                                                                                                                                     |
-| `orderBy`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | *Optional<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Allows to return organizations in a particular order.<br/>At the moment, you can order the returned organizations either by their `name`, `created_at` or `members_count`.<br/>In order to specify the direction, you can use the `+/-` symbols prepended in the property to order by.<br/>For example, if you want organizations to be returned in descending order according to their `created_at` property, you can use `-created_at`.<br/>If you don't use `+` or `-`, then `+` is implied.<br/>Defaults to `-created_at`. |
\ No newline at end of file
+| `limit`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | *Optional<Long>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                                                                                                                                                                                                                                                                                                                                                                                      |
+| `offset`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | *Optional<Long>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`.                                                                                                                                                                                                                                                                                                                                                          |
+| `includeMembersCount`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | *Optional<Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Flag to denote whether the member counts of each organization should be included in the response or not.                                                                                                                                                                                                                                                                                                                                                                                                   |
+| `query`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | *Optional<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Returns organizations with ID, name, or slug that match the given query.<br/>Uses exact match for organization ID and partial match for name and slug.                                                                                                                                                                                                                                                                                                                                                     |
+| `orderBy`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | *Optional<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Allows to return organizations in a particular order.<br/>At the moment, you can order the returned organizations either by their `name`, `created_at` or `members_count`.<br/>In order to specify the direction, you can use the `+/-` symbols prepended in the property to order by.<br/>For example, if you want organizations to be returned in descending order according to their `created_at` property, you can use `-created_at`.<br/>If you don't use `+` or `-`, then `+` is implied.<br/>Defaults to `-created_at`. |
\ No newline at end of file
diff --git a/docs/models/operations/ListOrganizationsResponse.md b/docs/models/operations/ListOrganizationsResponse.md
index 06c8076..68e6fb8 100644
--- a/docs/models/operations/ListOrganizationsResponse.md
+++ b/docs/models/operations/ListOrganizationsResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `organizations`                                                                                                               | [Optional<? extends com.clerk.backend_api.models.components.Organizations>](../../models/components/Organizations.md)         | :heavy_minus_sign:                                                                                                            | A list of organizations                                                                                                       |
\ No newline at end of file
+| `organizations`                                                                                                               | [Optional<Organizations>](../../models/components/Organizations.md)                                                           | :heavy_minus_sign:                                                                                                            | A list of organizations                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/ListPendingOrganizationInvitationsRequest.md b/docs/models/operations/ListPendingOrganizationInvitationsRequest.md
index c54c242..404d152 100644
--- a/docs/models/operations/ListPendingOrganizationInvitationsRequest.md
+++ b/docs/models/operations/ListPendingOrganizationInvitationsRequest.md
@@ -6,5 +6,5 @@
 | Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
 | `organizationId`                                                                                                                          | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | The organization ID.                                                                                                                      |
-| `limit`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
-| `offset`                                                                                                                                  | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
\ No newline at end of file
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
\ No newline at end of file
diff --git a/docs/models/operations/ListPendingOrganizationInvitationsResponse.md b/docs/models/operations/ListPendingOrganizationInvitationsResponse.md
index 09beef9..4c2e570 100644
--- a/docs/models/operations/ListPendingOrganizationInvitationsResponse.md
+++ b/docs/models/operations/ListPendingOrganizationInvitationsResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
-| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                             | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | HTTP response content type for this operation                                                                                             |
-| `statusCode`                                                                                                                              | *int*                                                                                                                                     | :heavy_check_mark:                                                                                                                        | HTTP response status code for this operation                                                                                              |
-| `rawResponse`                                                                                                                             | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)             | :heavy_check_mark:                                                                                                                        | Raw HTTP response; suitable for custom response parsing                                                                                   |
-| `organizationInvitations`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations>](../../models/components/OrganizationInvitations.md) | :heavy_minus_sign:                                                                                                                        | A list of organization invitations                                                                                                        |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `organizationInvitations`                                                                                                     | [Optional<OrganizationInvitations>](../../models/components/OrganizationInvitations.md)                                       | :heavy_minus_sign:                                                                                                            | A list of organization invitations                                                                                            |
\ No newline at end of file
diff --git a/docs/models/operations/ListRedirectURLsResponse.md b/docs/models/operations/ListRedirectURLsResponse.md
index b4ffe72..d40ebc4 100644
--- a/docs/models/operations/ListRedirectURLsResponse.md
+++ b/docs/models/operations/ListRedirectURLsResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `redirectURLList`                                                                                                             | List<[com.clerk.backend_api.models.components.RedirectURL](../../models/components/RedirectURL.md)>                           | :heavy_minus_sign:                                                                                                            | List of Redirect URLs                                                                                                         |
\ No newline at end of file
+| `redirectURLList`                                                                                                             | List<[RedirectURL](../../models/components/RedirectURL.md)>                                                                   | :heavy_minus_sign:                                                                                                            | List of Redirect URLs                                                                                                         |
\ No newline at end of file
diff --git a/docs/models/operations/ListSAMLConnectionsRequest.md b/docs/models/operations/ListSAMLConnectionsRequest.md
index c2a8c6a..f0ff9fd 100644
--- a/docs/models/operations/ListSAMLConnectionsRequest.md
+++ b/docs/models/operations/ListSAMLConnectionsRequest.md
@@ -5,5 +5,5 @@
 
 | Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `limit`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
-| `offset`                                                                                                                                  | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
\ No newline at end of file
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
\ No newline at end of file
diff --git a/docs/models/operations/ListSAMLConnectionsResponse.md b/docs/models/operations/ListSAMLConnectionsResponse.md
index 3273387..4ae28c8 100644
--- a/docs/models/operations/ListSAMLConnectionsResponse.md
+++ b/docs/models/operations/ListSAMLConnectionsResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `samlConnections`                                                                                                             | [Optional<? extends com.clerk.backend_api.models.components.SAMLConnections>](../../models/components/SAMLConnections.md)     | :heavy_minus_sign:                                                                                                            | A list of SAML Connections                                                                                                    |
\ No newline at end of file
+| `samlConnections`                                                                                                             | [Optional<SAMLConnections>](../../models/components/SAMLConnections.md)                                                       | :heavy_minus_sign:                                                                                                            | A list of SAML Connections                                                                                                    |
\ No newline at end of file
diff --git a/docs/models/operations/LockUserResponse.md b/docs/models/operations/LockUserResponse.md
index 6ae4ce8..44e9680 100644
--- a/docs/models/operations/LockUserResponse.md
+++ b/docs/models/operations/LockUserResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `user`                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.components.User>](../../models/components/User.md)                           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `user`                                                                                                                        | [Optional<User>](../../models/components/User.md)                                                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/MergeOrganizationMetadataRequest.md b/docs/models/operations/MergeOrganizationMetadataRequest.md
index 527dcfd..837da4e 100644
--- a/docs/models/operations/MergeOrganizationMetadataRequest.md
+++ b/docs/models/operations/MergeOrganizationMetadataRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                           | Type                                                                                                                                            | Required                                                                                                                                        | Description                                                                                                                                     |
-| ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                | *String*                                                                                                                                        | :heavy_check_mark:                                                                                                                              | The ID of the organization for which metadata will be merged or updated                                                                         |
-| `requestBody`                                                                                                                                   | [com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequestBody](../../models/operations/MergeOrganizationMetadataRequestBody.md) | :heavy_check_mark:                                                                                                                              | N/A                                                                                                                                             |
\ No newline at end of file
+| Field                                                                                                   | Type                                                                                                    | Required                                                                                                | Description                                                                                             |
+| ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                        | *String*                                                                                                | :heavy_check_mark:                                                                                      | The ID of the organization for which metadata will be merged or updated                                 |
+| `requestBody`                                                                                           | [MergeOrganizationMetadataRequestBody](../../models/operations/MergeOrganizationMetadataRequestBody.md) | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
\ No newline at end of file
diff --git a/docs/models/operations/MergeOrganizationMetadataRequestBody.md b/docs/models/operations/MergeOrganizationMetadataRequestBody.md
index ccae4af..2e1976c 100644
--- a/docs/models/operations/MergeOrganizationMetadataRequestBody.md
+++ b/docs/models/operations/MergeOrganizationMetadataRequestBody.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                                                       | Type                                                                                                                                                                        | Required                                                                                                                                                                    | Description                                                                                                                                                                 |
-| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `publicMetadata`                                                                                                                                                            | [Optional<? extends com.clerk.backend_api.models.operations.MergeOrganizationMetadataPublicMetadata>](../../models/operations/MergeOrganizationMetadataPublicMetadata.md)   | :heavy_minus_sign:                                                                                                                                                          | Metadata saved on the organization, that is visible to both your frontend and backend.<br/>The new object will be merged with the existing value.                           |
-| `privateMetadata`                                                                                                                                                           | [Optional<? extends com.clerk.backend_api.models.operations.MergeOrganizationMetadataPrivateMetadata>](../../models/operations/MergeOrganizationMetadataPrivateMetadata.md) | :heavy_minus_sign:                                                                                                                                                          | Metadata saved on the organization that is only visible to your backend.<br/>The new object will be merged with the existing value.                                         |
\ No newline at end of file
+| Field                                                                                                                                         | Type                                                                                                                                          | Required                                                                                                                                      | Description                                                                                                                                   |
+| --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
+| `publicMetadata`                                                                                                                              | [Optional<MergeOrganizationMetadataPublicMetadata>](../../models/operations/MergeOrganizationMetadataPublicMetadata.md)                       | :heavy_minus_sign:                                                                                                                            | Metadata saved on the organization, that is visible to both your frontend and backend.<br/>The new object will be merged with the existing value. |
+| `privateMetadata`                                                                                                                             | [Optional<MergeOrganizationMetadataPrivateMetadata>](../../models/operations/MergeOrganizationMetadataPrivateMetadata.md)                     | :heavy_minus_sign:                                                                                                                            | Metadata saved on the organization that is only visible to your backend.<br/>The new object will be merged with the existing value.           |
\ No newline at end of file
diff --git a/docs/models/operations/MergeOrganizationMetadataResponse.md b/docs/models/operations/MergeOrganizationMetadataResponse.md
index 7b36082..526503a 100644
--- a/docs/models/operations/MergeOrganizationMetadataResponse.md
+++ b/docs/models/operations/MergeOrganizationMetadataResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `organization`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.Organization>](../../models/components/Organization.md)           | :heavy_minus_sign:                                                                                                            | An organization                                                                                                               |
\ No newline at end of file
+| `organization`                                                                                                                | [Optional<Organization>](../../models/components/Organization.md)                                                             | :heavy_minus_sign:                                                                                                            | An organization                                                                                                               |
\ No newline at end of file
diff --git a/docs/models/operations/PreviewTemplateRequest.md b/docs/models/operations/PreviewTemplateRequest.md
index 46803d8..03af820 100644
--- a/docs/models/operations/PreviewTemplateRequest.md
+++ b/docs/models/operations/PreviewTemplateRequest.md
@@ -3,8 +3,8 @@
 
 ## Fields
 
-| Field                                                                                                                                           | Type                                                                                                                                            | Required                                                                                                                                        | Description                                                                                                                                     |
-| ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
-| `templateType`                                                                                                                                  | *String*                                                                                                                                        | :heavy_check_mark:                                                                                                                              | The type of template to preview                                                                                                                 |
-| `slug`                                                                                                                                          | *String*                                                                                                                                        | :heavy_check_mark:                                                                                                                              | The slug of the template to preview                                                                                                             |
-| `requestBody`                                                                                                                                   | [Optional<? extends com.clerk.backend_api.models.operations.PreviewTemplateRequestBody>](../../models/operations/PreviewTemplateRequestBody.md) | :heavy_minus_sign:                                                                                                                              | Required parameters                                                                                                                             |
\ No newline at end of file
+| Field                                                                                         | Type                                                                                          | Required                                                                                      | Description                                                                                   |
+| --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- |
+| `templateType`                                                                                | *String*                                                                                      | :heavy_check_mark:                                                                            | The type of template to preview                                                               |
+| `slug`                                                                                        | *String*                                                                                      | :heavy_check_mark:                                                                            | The slug of the template to preview                                                           |
+| `requestBody`                                                                                 | [Optional<PreviewTemplateRequestBody>](../../models/operations/PreviewTemplateRequestBody.md) | :heavy_minus_sign:                                                                            | Required parameters                                                                           |
\ No newline at end of file
diff --git a/docs/models/operations/PreviewTemplateRequestBody.md b/docs/models/operations/PreviewTemplateRequestBody.md
index aebf7ec..aae4da0 100644
--- a/docs/models/operations/PreviewTemplateRequestBody.md
+++ b/docs/models/operations/PreviewTemplateRequestBody.md
@@ -7,7 +7,7 @@ Required parameters
 
 | Field                                                                                                                                                                                      | Type                                                                                                                                                                                       | Required                                                                                                                                                                                   | Description                                                                                                                                                                                |
 | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `subject`                                                                                                                                                                                  | *JsonNullable<? extends String>*                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                         | The email subject.<br/>Applicable only to email templates.                                                                                                                                 |
-| `body`                                                                                                                                                                                     | *Optional<? extends String>*                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                         | The template body before variable interpolation                                                                                                                                            |
-| `fromEmailName`                                                                                                                                                                            | *Optional<? extends String>*                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                         | The local part of the From email address that will be used for emails.<br/>For example, in the address 'hello@example.com', the local part is 'hello'.<br/>Applicable only to email templates. |
-| `replyToEmailName`                                                                                                                                                                         | *Optional<? extends String>*                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                         | The local part of the Reply To email address that will be used for emails.<br/>For example, in the address 'hello@example.com', the local part is 'hello'.<br/>Applicable only to email templates. |
\ No newline at end of file
+| `subject`                                                                                                                                                                                  | *JsonNullable<String>*                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                         | The email subject.<br/>Applicable only to email templates.                                                                                                                                 |
+| `body`                                                                                                                                                                                     | *Optional<String>*                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                         | The template body before variable interpolation                                                                                                                                            |
+| `fromEmailName`                                                                                                                                                                            | *Optional<String>*                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                         | The local part of the From email address that will be used for emails.<br/>For example, in the address 'hello@example.com', the local part is 'hello'.<br/>Applicable only to email templates. |
+| `replyToEmailName`                                                                                                                                                                         | *Optional<String>*                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                         | The local part of the Reply To email address that will be used for emails.<br/>For example, in the address 'hello@example.com', the local part is 'hello'.<br/>Applicable only to email templates. |
\ No newline at end of file
diff --git a/docs/models/operations/PreviewTemplateResponse.md b/docs/models/operations/PreviewTemplateResponse.md
index f634a11..946e17a 100644
--- a/docs/models/operations/PreviewTemplateResponse.md
+++ b/docs/models/operations/PreviewTemplateResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                             | Type                                                                                                                                              | Required                                                                                                                                          | Description                                                                                                                                       |
-| ------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                                     | *String*                                                                                                                                          | :heavy_check_mark:                                                                                                                                | HTTP response content type for this operation                                                                                                     |
-| `statusCode`                                                                                                                                      | *int*                                                                                                                                             | :heavy_check_mark:                                                                                                                                | HTTP response status code for this operation                                                                                                      |
-| `rawResponse`                                                                                                                                     | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)                     | :heavy_check_mark:                                                                                                                                | Raw HTTP response; suitable for custom response parsing                                                                                           |
-| `object`                                                                                                                                          | [Optional<? extends com.clerk.backend_api.models.operations.PreviewTemplateResponseBody>](../../models/operations/PreviewTemplateResponseBody.md) | :heavy_minus_sign:                                                                                                                                | OK                                                                                                                                                |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `object`                                                                                                                      | [Optional<PreviewTemplateResponseBody>](../../models/operations/PreviewTemplateResponseBody.md)                               | :heavy_minus_sign:                                                                                                            | OK                                                                                                                            |
\ No newline at end of file
diff --git a/docs/models/operations/RequestBody.md b/docs/models/operations/RequestBody.md
index ced36bc..9932719 100644
--- a/docs/models/operations/RequestBody.md
+++ b/docs/models/operations/RequestBody.md
@@ -3,11 +3,11 @@
 
 ## Fields
 
-| Field                                                                                                                                                                                     | Type                                                                                                                                                                                      | Required                                                                                                                                                                                  | Description                                                                                                                                                                               |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `emailAddress`                                                                                                                                                                            | *String*                                                                                                                                                                                  | :heavy_check_mark:                                                                                                                                                                        | The email address of the new member that is going to be invited to the organization                                                                                                       |
-| `inviterUserId`                                                                                                                                                                           | *String*                                                                                                                                                                                  | :heavy_check_mark:                                                                                                                                                                        | The ID of the user that invites the new member to the organization.<br/>Must be an administrator in the organization.                                                                     |
-| `role`                                                                                                                                                                                    | *String*                                                                                                                                                                                  | :heavy_check_mark:                                                                                                                                                                        | The role of the new member in the organization.                                                                                                                                           |
-| `publicMetadata`                                                                                                                                                                          | [Optional<? extends com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkPublicMetadata>](../../models/operations/CreateOrganizationInvitationBulkPublicMetadata.md)   | :heavy_minus_sign:                                                                                                                                                                        | Metadata saved on the organization invitation, read-only from the Frontend API and fully accessible (read/write) from the Backend API.                                                    |
-| `privateMetadata`                                                                                                                                                                         | [Optional<? extends com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkPrivateMetadata>](../../models/operations/CreateOrganizationInvitationBulkPrivateMetadata.md) | :heavy_minus_sign:                                                                                                                                                                        | Metadata saved on the organization invitation, fully accessible (read/write) from the Backend API but not visible from the Frontend API.                                                  |
-| `redirectUrl`                                                                                                                                                                             | *Optional<? extends String>*                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                        | Optional URL that the invitee will be redirected to once they accept the invitation by clicking the join link in the invitation email.                                                    |
\ No newline at end of file
+| Field                                                                                                                                    | Type                                                                                                                                     | Required                                                                                                                                 | Description                                                                                                                              |
+| ---------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- |
+| `emailAddress`                                                                                                                           | *String*                                                                                                                                 | :heavy_check_mark:                                                                                                                       | The email address of the new member that is going to be invited to the organization                                                      |
+| `inviterUserId`                                                                                                                          | *String*                                                                                                                                 | :heavy_check_mark:                                                                                                                       | The ID of the user that invites the new member to the organization.<br/>Must be an administrator in the organization.                    |
+| `role`                                                                                                                                   | *String*                                                                                                                                 | :heavy_check_mark:                                                                                                                       | The role of the new member in the organization.                                                                                          |
+| `publicMetadata`                                                                                                                         | [Optional<CreateOrganizationInvitationBulkPublicMetadata>](../../models/operations/CreateOrganizationInvitationBulkPublicMetadata.md)    | :heavy_minus_sign:                                                                                                                       | Metadata saved on the organization invitation, read-only from the Frontend API and fully accessible (read/write) from the Backend API.   |
+| `privateMetadata`                                                                                                                        | [Optional<CreateOrganizationInvitationBulkPrivateMetadata>](../../models/operations/CreateOrganizationInvitationBulkPrivateMetadata.md)  | :heavy_minus_sign:                                                                                                                       | Metadata saved on the organization invitation, fully accessible (read/write) from the Backend API but not visible from the Frontend API. |
+| `redirectUrl`                                                                                                                            | *Optional<String>*                                                                                                                       | :heavy_minus_sign:                                                                                                                       | Optional URL that the invitee will be redirected to once they accept the invitation by clicking the join link in the invitation email.   |
\ No newline at end of file
diff --git a/docs/models/operations/ResponseBody.md b/docs/models/operations/ResponseBody.md
index e30f876..12a8fd5 100644
--- a/docs/models/operations/ResponseBody.md
+++ b/docs/models/operations/ResponseBody.md
@@ -3,14 +3,14 @@
 
 ## Fields
 
-| Field                                                                                                                                                         | Type                                                                                                                                                          | Required                                                                                                                                                      | Description                                                                                                                                                   |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `object`                                                                                                                                                      | *Optional<? extends String>*                                                                                                                                  | :heavy_minus_sign:                                                                                                                                            | N/A                                                                                                                                                           |
-| `externalAccountId`                                                                                                                                           | *Optional<? extends String>*                                                                                                                                  | :heavy_minus_sign:                                                                                                                                            | External account ID                                                                                                                                           |
-| `providerUserId`                                                                                                                                              | *Optional<? extends String>*                                                                                                                                  | :heavy_minus_sign:                                                                                                                                            | The unique ID of the user in the external provider's system                                                                                                   |
-| `token`                                                                                                                                                       | *Optional<? extends String>*                                                                                                                                  | :heavy_minus_sign:                                                                                                                                            | The access token                                                                                                                                              |
-| `provider`                                                                                                                                                    | *Optional<? extends String>*                                                                                                                                  | :heavy_minus_sign:                                                                                                                                            | The ID of the provider                                                                                                                                        |
-| `publicMetadata`                                                                                                                                              | [Optional<? extends com.clerk.backend_api.models.operations.GetOAuthAccessTokenPublicMetadata>](../../models/operations/GetOAuthAccessTokenPublicMetadata.md) | :heavy_minus_sign:                                                                                                                                            | N/A                                                                                                                                                           |
-| `label`                                                                                                                                                       | *JsonNullable<? extends String>*                                                                                                                              | :heavy_minus_sign:                                                                                                                                            | N/A                                                                                                                                                           |
-| `scopes`                                                                                                                                                      | List<*String*>                                                                                                                                                | :heavy_minus_sign:                                                                                                                                            | The list of scopes that the token is valid for.<br/>Only present for OAuth 2.0 tokens.                                                                        |
-| `tokenSecret`                                                                                                                                                 | *Optional<? extends String>*                                                                                                                                  | :heavy_minus_sign:                                                                                                                                            | The token secret. Only present for OAuth 1.0 tokens.                                                                                                          |
\ No newline at end of file
+| Field                                                                                                       | Type                                                                                                        | Required                                                                                                    | Description                                                                                                 |
+| ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
+| `object`                                                                                                    | *Optional<String>*                                                                                          | :heavy_minus_sign:                                                                                          | N/A                                                                                                         |
+| `externalAccountId`                                                                                         | *Optional<String>*                                                                                          | :heavy_minus_sign:                                                                                          | External account ID                                                                                         |
+| `providerUserId`                                                                                            | *Optional<String>*                                                                                          | :heavy_minus_sign:                                                                                          | The unique ID of the user in the external provider's system                                                 |
+| `token`                                                                                                     | *Optional<String>*                                                                                          | :heavy_minus_sign:                                                                                          | The access token                                                                                            |
+| `provider`                                                                                                  | *Optional<String>*                                                                                          | :heavy_minus_sign:                                                                                          | The ID of the provider                                                                                      |
+| `publicMetadata`                                                                                            | [Optional<GetOAuthAccessTokenPublicMetadata>](../../models/operations/GetOAuthAccessTokenPublicMetadata.md) | :heavy_minus_sign:                                                                                          | N/A                                                                                                         |
+| `label`                                                                                                     | *JsonNullable<String>*                                                                                      | :heavy_minus_sign:                                                                                          | N/A                                                                                                         |
+| `scopes`                                                                                                    | List<*String*>                                                                                              | :heavy_minus_sign:                                                                                          | The list of scopes that the token is valid for.<br/>Only present for OAuth 2.0 tokens.                      |
+| `tokenSecret`                                                                                               | *Optional<String>*                                                                                          | :heavy_minus_sign:                                                                                          | The token secret. Only present for OAuth 1.0 tokens.                                                        |
\ No newline at end of file
diff --git a/docs/models/operations/RevertTemplateRequest.md b/docs/models/operations/RevertTemplateRequest.md
index 5db4cff..fba28e6 100644
--- a/docs/models/operations/RevertTemplateRequest.md
+++ b/docs/models/operations/RevertTemplateRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                         | Type                                                                                                                                          | Required                                                                                                                                      | Description                                                                                                                                   |
-| --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| `templateType`                                                                                                                                | [com.clerk.backend_api.models.operations.RevertTemplatePathParamTemplateType](../../models/operations/RevertTemplatePathParamTemplateType.md) | :heavy_check_mark:                                                                                                                            | The type of template to revert                                                                                                                |
-| `slug`                                                                                                                                        | *String*                                                                                                                                      | :heavy_check_mark:                                                                                                                            | The slug of the template to revert                                                                                                            |
\ No newline at end of file
+| Field                                                                                                 | Type                                                                                                  | Required                                                                                              | Description                                                                                           |
+| ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- |
+| `templateType`                                                                                        | [RevertTemplatePathParamTemplateType](../../models/operations/RevertTemplatePathParamTemplateType.md) | :heavy_check_mark:                                                                                    | The type of template to revert                                                                        |
+| `slug`                                                                                                | *String*                                                                                              | :heavy_check_mark:                                                                                    | The slug of the template to revert                                                                    |
\ No newline at end of file
diff --git a/docs/models/operations/RevertTemplateResponse.md b/docs/models/operations/RevertTemplateResponse.md
index 8a440b2..860186b 100644
--- a/docs/models/operations/RevertTemplateResponse.md
+++ b/docs/models/operations/RevertTemplateResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `template`                                                                                                                    | [Optional<? extends com.clerk.backend_api.models.components.Template>](../../models/components/Template.md)                   | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `template`                                                                                                                    | [Optional<Template>](../../models/components/Template.md)                                                                     | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/RevokeActorTokenResponse.md b/docs/models/operations/RevokeActorTokenResponse.md
index e5ddcc7..3bbb4bd 100644
--- a/docs/models/operations/RevokeActorTokenResponse.md
+++ b/docs/models/operations/RevokeActorTokenResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `actorToken`                                                                                                                  | [Optional<? extends com.clerk.backend_api.models.components.ActorToken>](../../models/components/ActorToken.md)               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `actorToken`                                                                                                                  | [Optional<ActorToken>](../../models/components/ActorToken.md)                                                                 | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/RevokeInvitationResponse.md b/docs/models/operations/RevokeInvitationResponse.md
index ec3eb69..d235334 100644
--- a/docs/models/operations/RevokeInvitationResponse.md
+++ b/docs/models/operations/RevokeInvitationResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `invitationRevoked`                                                                                                           | [Optional<? extends com.clerk.backend_api.models.components.InvitationRevoked>](../../models/components/InvitationRevoked.md) | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `invitationRevoked`                                                                                                           | [Optional<InvitationRevoked>](../../models/components/InvitationRevoked.md)                                                   | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/RevokeOrganizationInvitationRequest.md b/docs/models/operations/RevokeOrganizationInvitationRequest.md
index 14d6edd..1fb98de 100644
--- a/docs/models/operations/RevokeOrganizationInvitationRequest.md
+++ b/docs/models/operations/RevokeOrganizationInvitationRequest.md
@@ -3,8 +3,8 @@
 
 ## Fields
 
-| Field                                                                                                                                                 | Type                                                                                                                                                  | Required                                                                                                                                              | Description                                                                                                                                           |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                      | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The organization ID.                                                                                                                                  |
-| `invitationId`                                                                                                                                        | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The organization invitation ID.                                                                                                                       |
-| `requestBody`                                                                                                                                         | [com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRequestBody](../../models/operations/RevokeOrganizationInvitationRequestBody.md) | :heavy_check_mark:                                                                                                                                    | N/A                                                                                                                                                   |
\ No newline at end of file
+| Field                                                                                                         | Type                                                                                                          | Required                                                                                                      | Description                                                                                                   |
+| ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                              | *String*                                                                                                      | :heavy_check_mark:                                                                                            | The organization ID.                                                                                          |
+| `invitationId`                                                                                                | *String*                                                                                                      | :heavy_check_mark:                                                                                            | The organization invitation ID.                                                                               |
+| `requestBody`                                                                                                 | [RevokeOrganizationInvitationRequestBody](../../models/operations/RevokeOrganizationInvitationRequestBody.md) | :heavy_check_mark:                                                                                            | N/A                                                                                                           |
\ No newline at end of file
diff --git a/docs/models/operations/RevokeOrganizationInvitationResponse.md b/docs/models/operations/RevokeOrganizationInvitationResponse.md
index 1ff33fa..e423a17 100644
--- a/docs/models/operations/RevokeOrganizationInvitationResponse.md
+++ b/docs/models/operations/RevokeOrganizationInvitationResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                   | Type                                                                                                                                    | Required                                                                                                                                | Description                                                                                                                             |
-| --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                           | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | HTTP response content type for this operation                                                                                           |
-| `statusCode`                                                                                                                            | *int*                                                                                                                                   | :heavy_check_mark:                                                                                                                      | HTTP response status code for this operation                                                                                            |
-| `rawResponse`                                                                                                                           | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)           | :heavy_check_mark:                                                                                                                      | Raw HTTP response; suitable for custom response parsing                                                                                 |
-| `organizationInvitation`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation>](../../models/components/OrganizationInvitation.md) | :heavy_minus_sign:                                                                                                                      | An organization invitation                                                                                                              |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `organizationInvitation`                                                                                                      | [Optional<OrganizationInvitation>](../../models/components/OrganizationInvitation.md)                                         | :heavy_minus_sign:                                                                                                            | An organization invitation                                                                                                    |
\ No newline at end of file
diff --git a/docs/models/operations/RevokeSessionResponse.md b/docs/models/operations/RevokeSessionResponse.md
index dd25474..31f24df 100644
--- a/docs/models/operations/RevokeSessionResponse.md
+++ b/docs/models/operations/RevokeSessionResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `session`                                                                                                                     | [Optional<? extends com.clerk.backend_api.models.components.Session>](../../models/components/Session.md)                     | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `session`                                                                                                                     | [Optional<Session>](../../models/components/Session.md)                                                                       | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/RevokeSignInTokenResponse.md b/docs/models/operations/RevokeSignInTokenResponse.md
index a02372a..95eb6a5 100644
--- a/docs/models/operations/RevokeSignInTokenResponse.md
+++ b/docs/models/operations/RevokeSignInTokenResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `signInToken`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.SignInToken>](../../models/components/SignInToken.md)             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `signInToken`                                                                                                                 | [Optional<SignInToken>](../../models/components/SignInToken.md)                                                               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/RotateOAuthApplicationSecretResponse.md b/docs/models/operations/RotateOAuthApplicationSecretResponse.md
index 19fbdc0..7fa9dbf 100644
--- a/docs/models/operations/RotateOAuthApplicationSecretResponse.md
+++ b/docs/models/operations/RotateOAuthApplicationSecretResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                           | Type                                                                                                                                            | Required                                                                                                                                        | Description                                                                                                                                     |
-| ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                                   | *String*                                                                                                                                        | :heavy_check_mark:                                                                                                                              | HTTP response content type for this operation                                                                                                   |
-| `statusCode`                                                                                                                                    | *int*                                                                                                                                           | :heavy_check_mark:                                                                                                                              | HTTP response status code for this operation                                                                                                    |
-| `rawResponse`                                                                                                                                   | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)                   | :heavy_check_mark:                                                                                                                              | Raw HTTP response; suitable for custom response parsing                                                                                         |
-| `oAuthApplicationWithSecret`                                                                                                                    | [Optional<? extends com.clerk.backend_api.models.components.OAuthApplicationWithSecret>](../../models/components/OAuthApplicationWithSecret.md) | :heavy_minus_sign:                                                                                                                              | An OAuth application with client secret                                                                                                         |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `oAuthApplicationWithSecret`                                                                                                  | [Optional<OAuthApplicationWithSecret>](../../models/components/OAuthApplicationWithSecret.md)                                 | :heavy_minus_sign:                                                                                                            | An OAuth application with client secret                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/SetUserProfileImageRequest.md b/docs/models/operations/SetUserProfileImageRequest.md
index 3e8a334..ebd799c 100644
--- a/docs/models/operations/SetUserProfileImageRequest.md
+++ b/docs/models/operations/SetUserProfileImageRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                               | Type                                                                                                                                | Required                                                                                                                            | Description                                                                                                                         |
-| ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `userId`                                                                                                                            | *String*                                                                                                                            | :heavy_check_mark:                                                                                                                  | The ID of the user to update the profile image for                                                                                  |
-| `requestBody`                                                                                                                       | [com.clerk.backend_api.models.operations.SetUserProfileImageRequestBody](../../models/operations/SetUserProfileImageRequestBody.md) | :heavy_check_mark:                                                                                                                  | N/A                                                                                                                                 |
\ No newline at end of file
+| Field                                                                                       | Type                                                                                        | Required                                                                                    | Description                                                                                 |
+| ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
+| `userId`                                                                                    | *String*                                                                                    | :heavy_check_mark:                                                                          | The ID of the user to update the profile image for                                          |
+| `requestBody`                                                                               | [SetUserProfileImageRequestBody](../../models/operations/SetUserProfileImageRequestBody.md) | :heavy_check_mark:                                                                          | N/A                                                                                         |
\ No newline at end of file
diff --git a/docs/models/operations/SetUserProfileImageRequestBody.md b/docs/models/operations/SetUserProfileImageRequestBody.md
index 239694c..5d0649c 100644
--- a/docs/models/operations/SetUserProfileImageRequestBody.md
+++ b/docs/models/operations/SetUserProfileImageRequestBody.md
@@ -3,6 +3,6 @@
 
 ## Fields
 
-| Field                                                                                               | Type                                                                                                | Required                                                                                            | Description                                                                                         |
-| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
-| `file`                                                                                              | [Optional<? extends com.clerk.backend_api.models.operations.File>](../../models/operations/File.md) | :heavy_minus_sign:                                                                                  | N/A                                                                                                 |
\ No newline at end of file
+| Field                                             | Type                                              | Required                                          | Description                                       |
+| ------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- |
+| `file`                                            | [Optional<File>](../../models/operations/File.md) | :heavy_minus_sign:                                | N/A                                               |
\ No newline at end of file
diff --git a/docs/models/operations/SetUserProfileImageResponse.md b/docs/models/operations/SetUserProfileImageResponse.md
index 8116cbb..739471c 100644
--- a/docs/models/operations/SetUserProfileImageResponse.md
+++ b/docs/models/operations/SetUserProfileImageResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `user`                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.components.User>](../../models/components/User.md)                           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `user`                                                                                                                        | [Optional<User>](../../models/components/User.md)                                                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/ToggleTemplateDeliveryRequest.md b/docs/models/operations/ToggleTemplateDeliveryRequest.md
index e2fb194..8ec0dee 100644
--- a/docs/models/operations/ToggleTemplateDeliveryRequest.md
+++ b/docs/models/operations/ToggleTemplateDeliveryRequest.md
@@ -3,8 +3,8 @@
 
 ## Fields
 
-| Field                                                                                                                                                         | Type                                                                                                                                                          | Required                                                                                                                                                      | Description                                                                                                                                                   |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `templateType`                                                                                                                                                | [com.clerk.backend_api.models.operations.ToggleTemplateDeliveryPathParamTemplateType](../../models/operations/ToggleTemplateDeliveryPathParamTemplateType.md) | :heavy_check_mark:                                                                                                                                            | The type of template to toggle delivery for                                                                                                                   |
-| `slug`                                                                                                                                                        | *String*                                                                                                                                                      | :heavy_check_mark:                                                                                                                                            | The slug of the template for which to toggle delivery                                                                                                         |
-| `requestBody`                                                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequestBody>](../../models/operations/ToggleTemplateDeliveryRequestBody.md) | :heavy_minus_sign:                                                                                                                                            | N/A                                                                                                                                                           |
\ No newline at end of file
+| Field                                                                                                                 | Type                                                                                                                  | Required                                                                                                              | Description                                                                                                           |
+| --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- |
+| `templateType`                                                                                                        | [ToggleTemplateDeliveryPathParamTemplateType](../../models/operations/ToggleTemplateDeliveryPathParamTemplateType.md) | :heavy_check_mark:                                                                                                    | The type of template to toggle delivery for                                                                           |
+| `slug`                                                                                                                | *String*                                                                                                              | :heavy_check_mark:                                                                                                    | The slug of the template for which to toggle delivery                                                                 |
+| `requestBody`                                                                                                         | [Optional<ToggleTemplateDeliveryRequestBody>](../../models/operations/ToggleTemplateDeliveryRequestBody.md)           | :heavy_minus_sign:                                                                                                    | N/A                                                                                                                   |
\ No newline at end of file
diff --git a/docs/models/operations/ToggleTemplateDeliveryRequestBody.md b/docs/models/operations/ToggleTemplateDeliveryRequestBody.md
index f7a4211..524c755 100644
--- a/docs/models/operations/ToggleTemplateDeliveryRequestBody.md
+++ b/docs/models/operations/ToggleTemplateDeliveryRequestBody.md
@@ -5,4 +5,4 @@
 
 | Field                                                                             | Type                                                                              | Required                                                                          | Description                                                                       |
 | --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- |
-| `deliveredByClerk`                                                                | *JsonNullable<? extends Boolean>*                                                 | :heavy_minus_sign:                                                                | Whether Clerk should deliver emails or SMS messages based on the current template |
\ No newline at end of file
+| `deliveredByClerk`                                                                | *JsonNullable<Boolean>*                                                           | :heavy_minus_sign:                                                                | Whether Clerk should deliver emails or SMS messages based on the current template |
\ No newline at end of file
diff --git a/docs/models/operations/ToggleTemplateDeliveryResponse.md b/docs/models/operations/ToggleTemplateDeliveryResponse.md
index 1fcbd31..aed32b8 100644
--- a/docs/models/operations/ToggleTemplateDeliveryResponse.md
+++ b/docs/models/operations/ToggleTemplateDeliveryResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `template`                                                                                                                    | [Optional<? extends com.clerk.backend_api.models.components.Template>](../../models/components/Template.md)                   | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `template`                                                                                                                    | [Optional<Template>](../../models/components/Template.md)                                                                     | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UnbanUserResponse.md b/docs/models/operations/UnbanUserResponse.md
index c2f5bdd..ebdd317 100644
--- a/docs/models/operations/UnbanUserResponse.md
+++ b/docs/models/operations/UnbanUserResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `user`                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.components.User>](../../models/components/User.md)                           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `user`                                                                                                                        | [Optional<User>](../../models/components/User.md)                                                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UnlockUserResponse.md b/docs/models/operations/UnlockUserResponse.md
index 5e64db5..e9ee0f8 100644
--- a/docs/models/operations/UnlockUserResponse.md
+++ b/docs/models/operations/UnlockUserResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `user`                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.components.User>](../../models/components/User.md)                           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `user`                                                                                                                        | [Optional<User>](../../models/components/User.md)                                                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateDomainRequest.md b/docs/models/operations/UpdateDomainRequest.md
index cb615e2..eede693 100644
--- a/docs/models/operations/UpdateDomainRequest.md
+++ b/docs/models/operations/UpdateDomainRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                 | Type                                                                                                                  | Required                                                                                                              | Description                                                                                                           |
-| --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- |
-| `domainId`                                                                                                            | *String*                                                                                                              | :heavy_check_mark:                                                                                                    | The ID of the domain that will be updated.                                                                            |
-| `requestBody`                                                                                                         | [com.clerk.backend_api.models.operations.UpdateDomainRequestBody](../../models/operations/UpdateDomainRequestBody.md) | :heavy_check_mark:                                                                                                    | N/A                                                                                                                   |
\ No newline at end of file
+| Field                                                                         | Type                                                                          | Required                                                                      | Description                                                                   |
+| ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- |
+| `domainId`                                                                    | *String*                                                                      | :heavy_check_mark:                                                            | The ID of the domain that will be updated.                                    |
+| `requestBody`                                                                 | [UpdateDomainRequestBody](../../models/operations/UpdateDomainRequestBody.md) | :heavy_check_mark:                                                            | N/A                                                                           |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateDomainRequestBody.md b/docs/models/operations/UpdateDomainRequestBody.md
index d3b9d5a..0ded2dd 100644
--- a/docs/models/operations/UpdateDomainRequestBody.md
+++ b/docs/models/operations/UpdateDomainRequestBody.md
@@ -5,5 +5,5 @@
 
 | Field                                                                                                                                                                                          | Type                                                                                                                                                                                           | Required                                                                                                                                                                                       | Description                                                                                                                                                                                    |
 | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `name`                                                                                                                                                                                         | *JsonNullable<? extends String>*                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                             | The new domain name. For development instances, can contain the port,<br/>i.e `myhostname:3000`. For production instances, must be a valid FQDN,<br/>i.e `mysite.com`. Cannot contain protocol scheme. |
-| `proxyUrl`                                                                                                                                                                                     | *JsonNullable<? extends String>*                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                             | The full URL of the proxy that will forward requests to Clerk's Frontend API.<br/>Can only be updated for production instances.                                                                |
\ No newline at end of file
+| `name`                                                                                                                                                                                         | *JsonNullable<String>*                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                             | The new domain name. For development instances, can contain the port,<br/>i.e `myhostname:3000`. For production instances, must be a valid FQDN,<br/>i.e `mysite.com`. Cannot contain protocol scheme. |
+| `proxyUrl`                                                                                                                                                                                     | *JsonNullable<String>*                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                             | The full URL of the proxy that will forward requests to Clerk's Frontend API.<br/>Can only be updated for production instances.                                                                |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateDomainResponse.md b/docs/models/operations/UpdateDomainResponse.md
index c6d7df3..a25bad9 100644
--- a/docs/models/operations/UpdateDomainResponse.md
+++ b/docs/models/operations/UpdateDomainResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `domain`                                                                                                                      | [Optional<? extends com.clerk.backend_api.models.components.Domain>](../../models/components/Domain.md)                       | :heavy_minus_sign:                                                                                                            | A domain                                                                                                                      |
\ No newline at end of file
+| `domain`                                                                                                                      | [Optional<Domain>](../../models/components/Domain.md)                                                                         | :heavy_minus_sign:                                                                                                            | A domain                                                                                                                      |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateEmailAddressRequest.md b/docs/models/operations/UpdateEmailAddressRequest.md
index 58e04bb..6b0c3be 100644
--- a/docs/models/operations/UpdateEmailAddressRequest.md
+++ b/docs/models/operations/UpdateEmailAddressRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                                 | Type                                                                                                                                                  | Required                                                                                                                                              | Description                                                                                                                                           |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `emailAddressId`                                                                                                                                      | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The ID of the email address to update                                                                                                                 |
-| `requestBody`                                                                                                                                         | [Optional<? extends com.clerk.backend_api.models.operations.UpdateEmailAddressRequestBody>](../../models/operations/UpdateEmailAddressRequestBody.md) | :heavy_minus_sign:                                                                                                                                    | N/A                                                                                                                                                   |
\ No newline at end of file
+| Field                                                                                               | Type                                                                                                | Required                                                                                            | Description                                                                                         |
+| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
+| `emailAddressId`                                                                                    | *String*                                                                                            | :heavy_check_mark:                                                                                  | The ID of the email address to update                                                               |
+| `requestBody`                                                                                       | [Optional<UpdateEmailAddressRequestBody>](../../models/operations/UpdateEmailAddressRequestBody.md) | :heavy_minus_sign:                                                                                  | N/A                                                                                                 |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateEmailAddressRequestBody.md b/docs/models/operations/UpdateEmailAddressRequestBody.md
index eb66d8d..56279de 100644
--- a/docs/models/operations/UpdateEmailAddressRequestBody.md
+++ b/docs/models/operations/UpdateEmailAddressRequestBody.md
@@ -5,5 +5,5 @@
 
 | Field                                                             | Type                                                              | Required                                                          | Description                                                       |
 | ----------------------------------------------------------------- | ----------------------------------------------------------------- | ----------------------------------------------------------------- | ----------------------------------------------------------------- |
-| `verified`                                                        | *JsonNullable<? extends Boolean>*                                 | :heavy_minus_sign:                                                | The email address will be marked as verified.                     |
-| `primary`                                                         | *JsonNullable<? extends Boolean>*                                 | :heavy_minus_sign:                                                | Set this email address as the primary email address for the user. |
\ No newline at end of file
+| `verified`                                                        | *JsonNullable<Boolean>*                                           | :heavy_minus_sign:                                                | The email address will be marked as verified.                     |
+| `primary`                                                         | *JsonNullable<Boolean>*                                           | :heavy_minus_sign:                                                | Set this email address as the primary email address for the user. |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateEmailAddressResponse.md b/docs/models/operations/UpdateEmailAddressResponse.md
index bc2f9b8..cd76389 100644
--- a/docs/models/operations/UpdateEmailAddressResponse.md
+++ b/docs/models/operations/UpdateEmailAddressResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `emailAddress`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.EmailAddress>](../../models/components/EmailAddress.md)           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `emailAddress`                                                                                                                | [Optional<EmailAddress>](../../models/components/EmailAddress.md)                                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateInstanceAuthConfigRequestBody.md b/docs/models/operations/UpdateInstanceAuthConfigRequestBody.md
index 194f066..bccfde4 100644
--- a/docs/models/operations/UpdateInstanceAuthConfigRequestBody.md
+++ b/docs/models/operations/UpdateInstanceAuthConfigRequestBody.md
@@ -5,9 +5,9 @@
 
 | Field                                                                                                                                                                                                                                                                    | Type                                                                                                                                                                                                                                                                     | Required                                                                                                                                                                                                                                                                 | Description                                                                                                                                                                                                                                                              |
 | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `restrictedToAllowlist`                                                                                                                                                                                                                                                  | *JsonNullable<? extends Boolean>*                                                                                                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                                                                                                       | Whether sign up is restricted to email addresses, phone numbers and usernames that are on the allowlist.                                                                                                                                                                 |
-| `fromEmailAddress`                                                                                                                                                                                                                                                       | *JsonNullable<? extends String>*                                                                                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                                                                                                       | The local part of the email address from which authentication-related emails (e.g. OTP code, magic links) will be sent.<br/>Only alphanumeric values are allowed.<br/>Note that this value should contain only the local part of the address (e.g. `foo` for `foo@example.com`). |
-| `progressiveSignUp`                                                                                                                                                                                                                                                      | *JsonNullable<? extends Boolean>*                                                                                                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                                                                                                       | Enable the Progressive Sign Up algorithm. Refer to the [docs](https://clerk.com/docs/upgrade-guides/progressive-sign-up) for more info.                                                                                                                                  |
-| `sessionTokenTemplate`                                                                                                                                                                                                                                                   | *JsonNullable<? extends String>*                                                                                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                                                                                                       | The name of the JWT Template used to augment your session tokens. To disable this, pass an empty string.                                                                                                                                                                 |
-| `enhancedEmailDeliverability`                                                                                                                                                                                                                                            | *JsonNullable<? extends Boolean>*                                                                                                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                                                                                                       | The "enhanced_email_deliverability" feature will send emails from "verifications@clerk.dev" instead of your domain.<br/>This can be helpful if you do not have a high domain reputation.                                                                                 |
-| `testMode`                                                                                                                                                                                                                                                               | *JsonNullable<? extends Boolean>*                                                                                                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                                                                                                       | Toggles test mode for this instance, allowing the use of test email addresses and phone numbers.<br/>Defaults to true for development instances.                                                                                                                         |
\ No newline at end of file
+| `restrictedToAllowlist`                                                                                                                                                                                                                                                  | *JsonNullable<Boolean>*                                                                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                                                       | Whether sign up is restricted to email addresses, phone numbers and usernames that are on the allowlist.                                                                                                                                                                 |
+| `fromEmailAddress`                                                                                                                                                                                                                                                       | *JsonNullable<String>*                                                                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                                                                       | The local part of the email address from which authentication-related emails (e.g. OTP code, magic links) will be sent.<br/>Only alphanumeric values are allowed.<br/>Note that this value should contain only the local part of the address (e.g. `foo` for `foo@example.com`). |
+| `progressiveSignUp`                                                                                                                                                                                                                                                      | *JsonNullable<Boolean>*                                                                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                                                       | Enable the Progressive Sign Up algorithm. Refer to the [docs](https://clerk.com/docs/upgrade-guides/progressive-sign-up) for more info.                                                                                                                                  |
+| `sessionTokenTemplate`                                                                                                                                                                                                                                                   | *JsonNullable<String>*                                                                                                                                                                                                                                                   | :heavy_minus_sign:                                                                                                                                                                                                                                                       | The name of the JWT Template used to augment your session tokens. To disable this, pass an empty string.                                                                                                                                                                 |
+| `enhancedEmailDeliverability`                                                                                                                                                                                                                                            | *JsonNullable<Boolean>*                                                                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                                                       | The "enhanced_email_deliverability" feature will send emails from "verifications@clerk.dev" instead of your domain.<br/>This can be helpful if you do not have a high domain reputation.                                                                                 |
+| `testMode`                                                                                                                                                                                                                                                               | *JsonNullable<Boolean>*                                                                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                                                       | Toggles test mode for this instance, allowing the use of test email addresses and phone numbers.<br/>Defaults to true for development instances.                                                                                                                         |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateInstanceAuthConfigResponse.md b/docs/models/operations/UpdateInstanceAuthConfigResponse.md
index eef6deb..c101f3f 100644
--- a/docs/models/operations/UpdateInstanceAuthConfigResponse.md
+++ b/docs/models/operations/UpdateInstanceAuthConfigResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `instanceSettings`                                                                                                            | [Optional<? extends com.clerk.backend_api.models.components.InstanceSettings>](../../models/components/InstanceSettings.md)   | :heavy_minus_sign:                                                                                                            | InstanceSettings Server API                                                                                                   |
\ No newline at end of file
+| `instanceSettings`                                                                                                            | [Optional<InstanceSettings>](../../models/components/InstanceSettings.md)                                                     | :heavy_minus_sign:                                                                                                            | InstanceSettings Server API                                                                                                   |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateInstanceOrganizationSettingsRequestBody.md b/docs/models/operations/UpdateInstanceOrganizationSettingsRequestBody.md
index 4464f4b..8859320 100644
--- a/docs/models/operations/UpdateInstanceOrganizationSettingsRequestBody.md
+++ b/docs/models/operations/UpdateInstanceOrganizationSettingsRequestBody.md
@@ -5,10 +5,10 @@
 
 | Field                                                                                                                                        | Type                                                                                                                                         | Required                                                                                                                                     | Description                                                                                                                                  |
 | -------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
-| `enabled`                                                                                                                                    | *JsonNullable<? extends Boolean>*                                                                                                            | :heavy_minus_sign:                                                                                                                           | N/A                                                                                                                                          |
-| `maxAllowedMemberships`                                                                                                                      | *JsonNullable<? extends Long>*                                                                                                               | :heavy_minus_sign:                                                                                                                           | N/A                                                                                                                                          |
-| `adminDeleteEnabled`                                                                                                                         | *JsonNullable<? extends Boolean>*                                                                                                            | :heavy_minus_sign:                                                                                                                           | N/A                                                                                                                                          |
-| `domainsEnabled`                                                                                                                             | *JsonNullable<? extends Boolean>*                                                                                                            | :heavy_minus_sign:                                                                                                                           | N/A                                                                                                                                          |
+| `enabled`                                                                                                                                    | *JsonNullable<Boolean>*                                                                                                                      | :heavy_minus_sign:                                                                                                                           | N/A                                                                                                                                          |
+| `maxAllowedMemberships`                                                                                                                      | *JsonNullable<Long>*                                                                                                                         | :heavy_minus_sign:                                                                                                                           | N/A                                                                                                                                          |
+| `adminDeleteEnabled`                                                                                                                         | *JsonNullable<Boolean>*                                                                                                                      | :heavy_minus_sign:                                                                                                                           | N/A                                                                                                                                          |
+| `domainsEnabled`                                                                                                                             | *JsonNullable<Boolean>*                                                                                                                      | :heavy_minus_sign:                                                                                                                           | N/A                                                                                                                                          |
 | `domainsEnrollmentModes`                                                                                                                     | List<*String*>                                                                                                                               | :heavy_minus_sign:                                                                                                                           | Specify which enrollment modes to enable for your Organization Domains.<br/>Supported modes are 'automatic_invitation' & 'automatic_suggestion'. |
-| `creatorRoleId`                                                                                                                              | *Optional<? extends String>*                                                                                                                 | :heavy_minus_sign:                                                                                                                           | Specify what the default organization role is for an organization creator.                                                                   |
-| `domainsDefaultRoleId`                                                                                                                       | *Optional<? extends String>*                                                                                                                 | :heavy_minus_sign:                                                                                                                           | Specify what the default organization role is for the organization domains.                                                                  |
\ No newline at end of file
+| `creatorRoleId`                                                                                                                              | *Optional<String>*                                                                                                                           | :heavy_minus_sign:                                                                                                                           | Specify what the default organization role is for an organization creator.                                                                   |
+| `domainsDefaultRoleId`                                                                                                                       | *Optional<String>*                                                                                                                           | :heavy_minus_sign:                                                                                                                           | Specify what the default organization role is for the organization domains.                                                                  |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateInstanceOrganizationSettingsResponse.md b/docs/models/operations/UpdateInstanceOrganizationSettingsResponse.md
index f5bf3bc..6855da0 100644
--- a/docs/models/operations/UpdateInstanceOrganizationSettingsResponse.md
+++ b/docs/models/operations/UpdateInstanceOrganizationSettingsResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                               | Type                                                                                                                                | Required                                                                                                                            | Description                                                                                                                         |
-| ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                       | *String*                                                                                                                            | :heavy_check_mark:                                                                                                                  | HTTP response content type for this operation                                                                                       |
-| `statusCode`                                                                                                                        | *int*                                                                                                                               | :heavy_check_mark:                                                                                                                  | HTTP response status code for this operation                                                                                        |
-| `rawResponse`                                                                                                                       | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)       | :heavy_check_mark:                                                                                                                  | Raw HTTP response; suitable for custom response parsing                                                                             |
-| `organizationSettings`                                                                                                              | [Optional<? extends com.clerk.backend_api.models.components.OrganizationSettings>](../../models/components/OrganizationSettings.md) | :heavy_minus_sign:                                                                                                                  | Success                                                                                                                             |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `organizationSettings`                                                                                                        | [Optional<OrganizationSettings>](../../models/components/OrganizationSettings.md)                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateInstanceRequestBody.md b/docs/models/operations/UpdateInstanceRequestBody.md
index 7868848..171e1aa 100644
--- a/docs/models/operations/UpdateInstanceRequestBody.md
+++ b/docs/models/operations/UpdateInstanceRequestBody.md
@@ -5,12 +5,12 @@
 
 | Field                                                                                                                                                                                                                                                                                                                                                                                             | Type                                                                                                                                                                                                                                                                                                                                                                                              | Required                                                                                                                                                                                                                                                                                                                                                                                          | Description                                                                                                                                                                                                                                                                                                                                                                                       |
 | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `testMode`                                                                                                                                                                                                                                                                                                                                                                                        | *JsonNullable<? extends Boolean>*                                                                                                                                                                                                                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | Toggles test mode for this instance, allowing the use of test email addresses and phone numbers.<br/>Defaults to true for development instances.                                                                                                                                                                                                                                                  |
-| `hibp`                                                                                                                                                                                                                                                                                                                                                                                            | *JsonNullable<? extends Boolean>*                                                                                                                                                                                                                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | Whether the instance should be using the HIBP service to check passwords for breaches                                                                                                                                                                                                                                                                                                             |
-| `enhancedEmailDeliverability`                                                                                                                                                                                                                                                                                                                                                                     | *JsonNullable<? extends Boolean>*                                                                                                                                                                                                                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | The "enhanced_email_deliverability" feature will send emails from "verifications@clerk.dev" instead of your domain.<br/>This can be helpful if you do not have a high domain reputation.                                                                                                                                                                                                          |
-| `supportEmail`                                                                                                                                                                                                                                                                                                                                                                                    | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | N/A                                                                                                                                                                                                                                                                                                                                                                                               |
-| `clerkJsVersion`                                                                                                                                                                                                                                                                                                                                                                                  | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | N/A                                                                                                                                                                                                                                                                                                                                                                                               |
-| `developmentOrigin`                                                                                                                                                                                                                                                                                                                                                                               | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | N/A                                                                                                                                                                                                                                                                                                                                                                                               |
+| `testMode`                                                                                                                                                                                                                                                                                                                                                                                        | *JsonNullable<Boolean>*                                                                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | Toggles test mode for this instance, allowing the use of test email addresses and phone numbers.<br/>Defaults to true for development instances.                                                                                                                                                                                                                                                  |
+| `hibp`                                                                                                                                                                                                                                                                                                                                                                                            | *JsonNullable<Boolean>*                                                                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | Whether the instance should be using the HIBP service to check passwords for breaches                                                                                                                                                                                                                                                                                                             |
+| `enhancedEmailDeliverability`                                                                                                                                                                                                                                                                                                                                                                     | *JsonNullable<Boolean>*                                                                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | The "enhanced_email_deliverability" feature will send emails from "verifications@clerk.dev" instead of your domain.<br/>This can be helpful if you do not have a high domain reputation.                                                                                                                                                                                                          |
+| `supportEmail`                                                                                                                                                                                                                                                                                                                                                                                    | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | N/A                                                                                                                                                                                                                                                                                                                                                                                               |
+| `clerkJsVersion`                                                                                                                                                                                                                                                                                                                                                                                  | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | N/A                                                                                                                                                                                                                                                                                                                                                                                               |
+| `developmentOrigin`                                                                                                                                                                                                                                                                                                                                                                               | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                                                            | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | N/A                                                                                                                                                                                                                                                                                                                                                                                               |
 | `allowedOrigins`                                                                                                                                                                                                                                                                                                                                                                                  | List<*String*>                                                                                                                                                                                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | For browser-like stacks such as browser extensions, Electron, or Capacitor.js the instance allowed origins need to be updated with the request origin value.<br/>For Chrome extensions popup, background, or service worker pages the origin is chrome-extension://extension_uiid. For Electron apps the default origin is http://localhost:3000. For Capacitor, the origin is capacitor://localhost. |
-| ~~`cookielessDev`~~                                                                                                                                                                                                                                                                                                                                                                               | *Optional<? extends Boolean>*                                                                                                                                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | : warning: ** DEPRECATED **: This will be removed in a future release, please migrate away from it as soon as possible.<br/><br/>Whether the instance should operate in cookieless development mode (i.e. without third-party cookies).<br/>Deprecated: Please use `url_based_session_syncing` instead.                                                                                           |
-| `urlBasedSessionSyncing`                                                                                                                                                                                                                                                                                                                                                                          | *Optional<? extends Boolean>*                                                                                                                                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | Whether the instance should use URL-based session syncing in development mode (i.e. without third-party cookies).                                                                                                                                                                                                                                                                                 |
\ No newline at end of file
+| ~~`cookielessDev`~~                                                                                                                                                                                                                                                                                                                                                                               | *Optional<Boolean>*                                                                                                                                                                                                                                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | : warning: ** DEPRECATED **: This will be removed in a future release, please migrate away from it as soon as possible.<br/><br/>Whether the instance should operate in cookieless development mode (i.e. without third-party cookies).<br/>Deprecated: Please use `url_based_session_syncing` instead.                                                                                           |
+| `urlBasedSessionSyncing`                                                                                                                                                                                                                                                                                                                                                                          | *Optional<Boolean>*                                                                                                                                                                                                                                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                | Whether the instance should use URL-based session syncing in development mode (i.e. without third-party cookies).                                                                                                                                                                                                                                                                                 |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateInstanceRestrictionsRequestBody.md b/docs/models/operations/UpdateInstanceRestrictionsRequestBody.md
index 19cf748..fd843b5 100644
--- a/docs/models/operations/UpdateInstanceRestrictionsRequestBody.md
+++ b/docs/models/operations/UpdateInstanceRestrictionsRequestBody.md
@@ -3,10 +3,10 @@
 
 ## Fields
 
-| Field                             | Type                              | Required                          | Description                       |
-| --------------------------------- | --------------------------------- | --------------------------------- | --------------------------------- |
-| `allowlist`                       | *JsonNullable<? extends Boolean>* | :heavy_minus_sign:                | N/A                               |
-| `blocklist`                       | *JsonNullable<? extends Boolean>* | :heavy_minus_sign:                | N/A                               |
-| `blockEmailSubaddresses`          | *JsonNullable<? extends Boolean>* | :heavy_minus_sign:                | N/A                               |
-| `blockDisposableEmailDomains`     | *JsonNullable<? extends Boolean>* | :heavy_minus_sign:                | N/A                               |
-| `ignoreDotsForGmailAddresses`     | *JsonNullable<? extends Boolean>* | :heavy_minus_sign:                | N/A                               |
\ No newline at end of file
+| Field                         | Type                          | Required                      | Description                   |
+| ----------------------------- | ----------------------------- | ----------------------------- | ----------------------------- |
+| `allowlist`                   | *JsonNullable<Boolean>*       | :heavy_minus_sign:            | N/A                           |
+| `blocklist`                   | *JsonNullable<Boolean>*       | :heavy_minus_sign:            | N/A                           |
+| `blockEmailSubaddresses`      | *JsonNullable<Boolean>*       | :heavy_minus_sign:            | N/A                           |
+| `blockDisposableEmailDomains` | *JsonNullable<Boolean>*       | :heavy_minus_sign:            | N/A                           |
+| `ignoreDotsForGmailAddresses` | *JsonNullable<Boolean>*       | :heavy_minus_sign:            | N/A                           |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateInstanceRestrictionsResponse.md b/docs/models/operations/UpdateInstanceRestrictionsResponse.md
index afa22e4..0aedc6f 100644
--- a/docs/models/operations/UpdateInstanceRestrictionsResponse.md
+++ b/docs/models/operations/UpdateInstanceRestrictionsResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                               | Type                                                                                                                                | Required                                                                                                                            | Description                                                                                                                         |
-| ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                       | *String*                                                                                                                            | :heavy_check_mark:                                                                                                                  | HTTP response content type for this operation                                                                                       |
-| `statusCode`                                                                                                                        | *int*                                                                                                                               | :heavy_check_mark:                                                                                                                  | HTTP response status code for this operation                                                                                        |
-| `rawResponse`                                                                                                                       | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)       | :heavy_check_mark:                                                                                                                  | Raw HTTP response; suitable for custom response parsing                                                                             |
-| `instanceRestrictions`                                                                                                              | [Optional<? extends com.clerk.backend_api.models.components.InstanceRestrictions>](../../models/components/InstanceRestrictions.md) | :heavy_minus_sign:                                                                                                                  | Success                                                                                                                             |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `instanceRestrictions`                                                                                                        | [Optional<InstanceRestrictions>](../../models/components/InstanceRestrictions.md)                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateJWTTemplateRequest.md b/docs/models/operations/UpdateJWTTemplateRequest.md
index 5540acc..166ea8e 100644
--- a/docs/models/operations/UpdateJWTTemplateRequest.md
+++ b/docs/models/operations/UpdateJWTTemplateRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                               | Type                                                                                                                                                | Required                                                                                                                                            | Description                                                                                                                                         |
-| --------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `templateId`                                                                                                                                        | *String*                                                                                                                                            | :heavy_check_mark:                                                                                                                                  | The ID of the JWT template to update                                                                                                                |
-| `requestBody`                                                                                                                                       | [Optional<? extends com.clerk.backend_api.models.operations.UpdateJWTTemplateRequestBody>](../../models/operations/UpdateJWTTemplateRequestBody.md) | :heavy_minus_sign:                                                                                                                                  | N/A                                                                                                                                                 |
\ No newline at end of file
+| Field                                                                                             | Type                                                                                              | Required                                                                                          | Description                                                                                       |
+| ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
+| `templateId`                                                                                      | *String*                                                                                          | :heavy_check_mark:                                                                                | The ID of the JWT template to update                                                              |
+| `requestBody`                                                                                     | [Optional<UpdateJWTTemplateRequestBody>](../../models/operations/UpdateJWTTemplateRequestBody.md) | :heavy_minus_sign:                                                                                | N/A                                                                                               |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateJWTTemplateRequestBody.md b/docs/models/operations/UpdateJWTTemplateRequestBody.md
index 62eb52e..0fbab7a 100644
--- a/docs/models/operations/UpdateJWTTemplateRequestBody.md
+++ b/docs/models/operations/UpdateJWTTemplateRequestBody.md
@@ -3,12 +3,12 @@
 
 ## Fields
 
-| Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
-| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `name`                                                                                                                                    | *Optional<? extends String>*                                                                                                              | :heavy_minus_sign:                                                                                                                        | JWT template name                                                                                                                         |
-| `claims`                                                                                                                                  | [Optional<? extends com.clerk.backend_api.models.operations.UpdateJWTTemplateClaims>](../../models/operations/UpdateJWTTemplateClaims.md) | :heavy_minus_sign:                                                                                                                        | JWT template claims in JSON format                                                                                                        |
-| `lifetime`                                                                                                                                | *JsonNullable<? extends Double>*                                                                                                          | :heavy_minus_sign:                                                                                                                        | JWT token lifetime                                                                                                                        |
-| `allowedClockSkew`                                                                                                                        | *JsonNullable<? extends Double>*                                                                                                          | :heavy_minus_sign:                                                                                                                        | JWT token allowed clock skew                                                                                                              |
-| `customSigningKey`                                                                                                                        | *Optional<? extends Boolean>*                                                                                                             | :heavy_minus_sign:                                                                                                                        | Whether a custom signing key/algorithm is also provided for this template                                                                 |
-| `signingAlgorithm`                                                                                                                        | *JsonNullable<? extends String>*                                                                                                          | :heavy_minus_sign:                                                                                                                        | The custom signing algorithm to use when minting JWTs                                                                                     |
-| `signingKey`                                                                                                                              | *JsonNullable<? extends String>*                                                                                                          | :heavy_minus_sign:                                                                                                                        | The custom signing private key to use when minting JWTs                                                                                   |
\ No newline at end of file
+| Field                                                                                   | Type                                                                                    | Required                                                                                | Description                                                                             |
+| --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
+| `name`                                                                                  | *Optional<String>*                                                                      | :heavy_minus_sign:                                                                      | JWT template name                                                                       |
+| `claims`                                                                                | [Optional<UpdateJWTTemplateClaims>](../../models/operations/UpdateJWTTemplateClaims.md) | :heavy_minus_sign:                                                                      | JWT template claims in JSON format                                                      |
+| `lifetime`                                                                              | *JsonNullable<Double>*                                                                  | :heavy_minus_sign:                                                                      | JWT token lifetime                                                                      |
+| `allowedClockSkew`                                                                      | *JsonNullable<Double>*                                                                  | :heavy_minus_sign:                                                                      | JWT token allowed clock skew                                                            |
+| `customSigningKey`                                                                      | *Optional<Boolean>*                                                                     | :heavy_minus_sign:                                                                      | Whether a custom signing key/algorithm is also provided for this template               |
+| `signingAlgorithm`                                                                      | *JsonNullable<String>*                                                                  | :heavy_minus_sign:                                                                      | The custom signing algorithm to use when minting JWTs                                   |
+| `signingKey`                                                                            | *JsonNullable<String>*                                                                  | :heavy_minus_sign:                                                                      | The custom signing private key to use when minting JWTs                                 |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateJWTTemplateResponse.md b/docs/models/operations/UpdateJWTTemplateResponse.md
index 21a571d..ffc1826 100644
--- a/docs/models/operations/UpdateJWTTemplateResponse.md
+++ b/docs/models/operations/UpdateJWTTemplateResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `jwtTemplate`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.JWTTemplate>](../../models/components/JWTTemplate.md)             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `jwtTemplate`                                                                                                                 | [Optional<JWTTemplate>](../../models/components/JWTTemplate.md)                                                               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateOAuthApplicationRequest.md b/docs/models/operations/UpdateOAuthApplicationRequest.md
index 90dc7c2..26cb683 100644
--- a/docs/models/operations/UpdateOAuthApplicationRequest.md
+++ b/docs/models/operations/UpdateOAuthApplicationRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
-| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `oauthApplicationId`                                                                                                                      | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | The ID of the OAuth application to update                                                                                                 |
-| `requestBody`                                                                                                                             | [com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequestBody](../../models/operations/UpdateOAuthApplicationRequestBody.md) | :heavy_check_mark:                                                                                                                        | N/A                                                                                                                                       |
\ No newline at end of file
+| Field                                                                                             | Type                                                                                              | Required                                                                                          | Description                                                                                       |
+| ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
+| `oauthApplicationId`                                                                              | *String*                                                                                          | :heavy_check_mark:                                                                                | The ID of the OAuth application to update                                                         |
+| `requestBody`                                                                                     | [UpdateOAuthApplicationRequestBody](../../models/operations/UpdateOAuthApplicationRequestBody.md) | :heavy_check_mark:                                                                                | N/A                                                                                               |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateOAuthApplicationRequestBody.md b/docs/models/operations/UpdateOAuthApplicationRequestBody.md
index 4889784..3eb0005 100644
--- a/docs/models/operations/UpdateOAuthApplicationRequestBody.md
+++ b/docs/models/operations/UpdateOAuthApplicationRequestBody.md
@@ -5,6 +5,6 @@
 
 | Field                                                                                                                                                                                                                                                                  | Type                                                                                                                                                                                                                                                                   | Required                                                                                                                                                                                                                                                               | Description                                                                                                                                                                                                                                                            | Example                                                                                                                                                                                                                                                                |
 | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `name`                                                                                                                                                                                                                                                                 | *Optional<? extends String>*                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                     | The new name of the OAuth application                                                                                                                                                                                                                                  |                                                                                                                                                                                                                                                                        |
-| `callbackUrl`                                                                                                                                                                                                                                                          | *Optional<? extends String>*                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                     | The new callback URL of the OAuth application                                                                                                                                                                                                                          |                                                                                                                                                                                                                                                                        |
-| `scopes`                                                                                                                                                                                                                                                               | *Optional<? extends String>*                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                     | Define the allowed scopes for the new OAuth applications that dictate the user payload of the OAuth user info endpoint. Available scopes are `profile`, `email`, `public_metadata`, `private_metadata`. Provide the requested scopes as a string, separated by spaces. | profile email public_metadata private_metadata                                                                                                                                                                                                                         |
\ No newline at end of file
+| `name`                                                                                                                                                                                                                                                                 | *Optional<String>*                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                     | The new name of the OAuth application                                                                                                                                                                                                                                  |                                                                                                                                                                                                                                                                        |
+| `callbackUrl`                                                                                                                                                                                                                                                          | *Optional<String>*                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                     | The new callback URL of the OAuth application                                                                                                                                                                                                                          |                                                                                                                                                                                                                                                                        |
+| `scopes`                                                                                                                                                                                                                                                               | *Optional<String>*                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                     | Define the allowed scopes for the new OAuth applications that dictate the user payload of the OAuth user info endpoint. Available scopes are `profile`, `email`, `public_metadata`, `private_metadata`. Provide the requested scopes as a string, separated by spaces. | profile email public_metadata private_metadata                                                                                                                                                                                                                         |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateOAuthApplicationResponse.md b/docs/models/operations/UpdateOAuthApplicationResponse.md
index 14ceb93..2436a43 100644
--- a/docs/models/operations/UpdateOAuthApplicationResponse.md
+++ b/docs/models/operations/UpdateOAuthApplicationResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `oAuthApplication`                                                                                                            | [Optional<? extends com.clerk.backend_api.models.components.OAuthApplication>](../../models/components/OAuthApplication.md)   | :heavy_minus_sign:                                                                                                            | An OAuth application                                                                                                          |
\ No newline at end of file
+| `oAuthApplication`                                                                                                            | [Optional<OAuthApplication>](../../models/components/OAuthApplication.md)                                                     | :heavy_minus_sign:                                                                                                            | An OAuth application                                                                                                          |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateOrganizationMembershipMetadataRequest.md b/docs/models/operations/UpdateOrganizationMembershipMetadataRequest.md
index 5b1d08a..192418c 100644
--- a/docs/models/operations/UpdateOrganizationMembershipMetadataRequest.md
+++ b/docs/models/operations/UpdateOrganizationMembershipMetadataRequest.md
@@ -3,8 +3,8 @@
 
 ## Fields
 
-| Field                                                                                                                                                                 | Type                                                                                                                                                                  | Required                                                                                                                                                              | Description                                                                                                                                                           |
-| --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                                      | *String*                                                                                                                                                              | :heavy_check_mark:                                                                                                                                                    | The ID of the organization the membership belongs to                                                                                                                  |
-| `userId`                                                                                                                                                              | *String*                                                                                                                                                              | :heavy_check_mark:                                                                                                                                                    | The ID of the user that this membership belongs to                                                                                                                    |
-| `requestBody`                                                                                                                                                         | [com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataRequestBody](../../models/operations/UpdateOrganizationMembershipMetadataRequestBody.md) | :heavy_check_mark:                                                                                                                                                    | N/A                                                                                                                                                                   |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                                              | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | The ID of the organization the membership belongs to                                                                          |
+| `userId`                                                                                                                      | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | The ID of the user that this membership belongs to                                                                            |
+| `requestBody`                                                                                                                 | [UpdateOrganizationMembershipMetadataRequestBody](../../models/operations/UpdateOrganizationMembershipMetadataRequestBody.md) | :heavy_check_mark:                                                                                                            | N/A                                                                                                                           |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateOrganizationMembershipMetadataRequestBody.md b/docs/models/operations/UpdateOrganizationMembershipMetadataRequestBody.md
index 0ea6634..19afbcf 100644
--- a/docs/models/operations/UpdateOrganizationMembershipMetadataRequestBody.md
+++ b/docs/models/operations/UpdateOrganizationMembershipMetadataRequestBody.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                                                                             | Type                                                                                                                                                                                              | Required                                                                                                                                                                                          | Description                                                                                                                                                                                       |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `publicMetadata`                                                                                                                                                                                  | [Optional<? extends com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataPublicMetadata>](../../models/operations/UpdateOrganizationMembershipMetadataPublicMetadata.md)   | :heavy_minus_sign:                                                                                                                                                                                | Metadata saved on the organization membership, that is visible to both your frontend and backend.<br/>The new object will be merged with the existing value.                                      |
-| `privateMetadata`                                                                                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataPrivateMetadata>](../../models/operations/UpdateOrganizationMembershipMetadataPrivateMetadata.md) | :heavy_minus_sign:                                                                                                                                                                                | Metadata saved on the organization membership that is only visible to your backend.<br/>The new object will be merged with the existing value.                                                    |
\ No newline at end of file
+| Field                                                                                                                                                    | Type                                                                                                                                                     | Required                                                                                                                                                 | Description                                                                                                                                              |
+| -------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `publicMetadata`                                                                                                                                         | [Optional<UpdateOrganizationMembershipMetadataPublicMetadata>](../../models/operations/UpdateOrganizationMembershipMetadataPublicMetadata.md)            | :heavy_minus_sign:                                                                                                                                       | Metadata saved on the organization membership, that is visible to both your frontend and backend.<br/>The new object will be merged with the existing value. |
+| `privateMetadata`                                                                                                                                        | [Optional<UpdateOrganizationMembershipMetadataPrivateMetadata>](../../models/operations/UpdateOrganizationMembershipMetadataPrivateMetadata.md)          | :heavy_minus_sign:                                                                                                                                       | Metadata saved on the organization membership that is only visible to your backend.<br/>The new object will be merged with the existing value.           |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateOrganizationMembershipMetadataResponse.md b/docs/models/operations/UpdateOrganizationMembershipMetadataResponse.md
index 7527fba..880032f 100644
--- a/docs/models/operations/UpdateOrganizationMembershipMetadataResponse.md
+++ b/docs/models/operations/UpdateOrganizationMembershipMetadataResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                   | Type                                                                                                                                    | Required                                                                                                                                | Description                                                                                                                             |
-| --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                           | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | HTTP response content type for this operation                                                                                           |
-| `statusCode`                                                                                                                            | *int*                                                                                                                                   | :heavy_check_mark:                                                                                                                      | HTTP response status code for this operation                                                                                            |
-| `rawResponse`                                                                                                                           | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)           | :heavy_check_mark:                                                                                                                      | Raw HTTP response; suitable for custom response parsing                                                                                 |
-| `organizationMembership`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership>](../../models/components/OrganizationMembership.md) | :heavy_minus_sign:                                                                                                                      | Success                                                                                                                                 |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `organizationMembership`                                                                                                      | [Optional<OrganizationMembership>](../../models/components/OrganizationMembership.md)                                         | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateOrganizationMembershipRequest.md b/docs/models/operations/UpdateOrganizationMembershipRequest.md
index 2b4ceca..a9e609f 100644
--- a/docs/models/operations/UpdateOrganizationMembershipRequest.md
+++ b/docs/models/operations/UpdateOrganizationMembershipRequest.md
@@ -3,8 +3,8 @@
 
 ## Fields
 
-| Field                                                                                                                                                 | Type                                                                                                                                                  | Required                                                                                                                                              | Description                                                                                                                                           |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                      | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The ID of the organization the membership belongs to                                                                                                  |
-| `userId`                                                                                                                                              | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The ID of the user that this membership belongs to                                                                                                    |
-| `requestBody`                                                                                                                                         | [com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRequestBody](../../models/operations/UpdateOrganizationMembershipRequestBody.md) | :heavy_check_mark:                                                                                                                                    | N/A                                                                                                                                                   |
\ No newline at end of file
+| Field                                                                                                         | Type                                                                                                          | Required                                                                                                      | Description                                                                                                   |
+| ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                              | *String*                                                                                                      | :heavy_check_mark:                                                                                            | The ID of the organization the membership belongs to                                                          |
+| `userId`                                                                                                      | *String*                                                                                                      | :heavy_check_mark:                                                                                            | The ID of the user that this membership belongs to                                                            |
+| `requestBody`                                                                                                 | [UpdateOrganizationMembershipRequestBody](../../models/operations/UpdateOrganizationMembershipRequestBody.md) | :heavy_check_mark:                                                                                            | N/A                                                                                                           |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateOrganizationMembershipResponse.md b/docs/models/operations/UpdateOrganizationMembershipResponse.md
index 9e1a948..55e157b 100644
--- a/docs/models/operations/UpdateOrganizationMembershipResponse.md
+++ b/docs/models/operations/UpdateOrganizationMembershipResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                   | Type                                                                                                                                    | Required                                                                                                                                | Description                                                                                                                             |
-| --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                           | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | HTTP response content type for this operation                                                                                           |
-| `statusCode`                                                                                                                            | *int*                                                                                                                                   | :heavy_check_mark:                                                                                                                      | HTTP response status code for this operation                                                                                            |
-| `rawResponse`                                                                                                                           | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)           | :heavy_check_mark:                                                                                                                      | Raw HTTP response; suitable for custom response parsing                                                                                 |
-| `organizationMembership`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership>](../../models/components/OrganizationMembership.md) | :heavy_minus_sign:                                                                                                                      | Success                                                                                                                                 |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `organizationMembership`                                                                                                      | [Optional<OrganizationMembership>](../../models/components/OrganizationMembership.md)                                         | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateOrganizationRequest.md b/docs/models/operations/UpdateOrganizationRequest.md
index 2c5087d..7e91d26 100644
--- a/docs/models/operations/UpdateOrganizationRequest.md
+++ b/docs/models/operations/UpdateOrganizationRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                             | Type                                                                                                                              | Required                                                                                                                          | Description                                                                                                                       |
-| --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                  | *String*                                                                                                                          | :heavy_check_mark:                                                                                                                | The ID of the organization to update                                                                                              |
-| `requestBody`                                                                                                                     | [com.clerk.backend_api.models.operations.UpdateOrganizationRequestBody](../../models/operations/UpdateOrganizationRequestBody.md) | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
\ No newline at end of file
+| Field                                                                                     | Type                                                                                      | Required                                                                                  | Description                                                                               |
+| ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- |
+| `organizationId`                                                                          | *String*                                                                                  | :heavy_check_mark:                                                                        | The ID of the organization to update                                                      |
+| `requestBody`                                                                             | [UpdateOrganizationRequestBody](../../models/operations/UpdateOrganizationRequestBody.md) | :heavy_check_mark:                                                                        | N/A                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateOrganizationRequestBody.md b/docs/models/operations/UpdateOrganizationRequestBody.md
index 7c98239..b42c902 100644
--- a/docs/models/operations/UpdateOrganizationRequestBody.md
+++ b/docs/models/operations/UpdateOrganizationRequestBody.md
@@ -3,11 +3,11 @@
 
 ## Fields
 
-| Field                                                                                                                                                         | Type                                                                                                                                                          | Required                                                                                                                                                      | Description                                                                                                                                                   |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `publicMetadata`                                                                                                                                              | [Optional<? extends com.clerk.backend_api.models.operations.UpdateOrganizationPublicMetadata>](../../models/operations/UpdateOrganizationPublicMetadata.md)   | :heavy_minus_sign:                                                                                                                                            | Metadata saved on the organization, that is visible to both your frontend and backend.                                                                        |
-| `privateMetadata`                                                                                                                                             | [Optional<? extends com.clerk.backend_api.models.operations.UpdateOrganizationPrivateMetadata>](../../models/operations/UpdateOrganizationPrivateMetadata.md) | :heavy_minus_sign:                                                                                                                                            | Metadata saved on the organization that is only visible to your backend.                                                                                      |
-| `name`                                                                                                                                                        | *JsonNullable<? extends String>*                                                                                                                              | :heavy_minus_sign:                                                                                                                                            | The new name of the organization                                                                                                                              |
-| `slug`                                                                                                                                                        | *JsonNullable<? extends String>*                                                                                                                              | :heavy_minus_sign:                                                                                                                                            | The new slug of the organization, which needs to be unique in the instance                                                                                    |
-| `maxAllowedMemberships`                                                                                                                                       | *JsonNullable<? extends Long>*                                                                                                                                | :heavy_minus_sign:                                                                                                                                            | The maximum number of memberships allowed for this organization                                                                                               |
-| `adminDeleteEnabled`                                                                                                                                          | *JsonNullable<? extends Boolean>*                                                                                                                             | :heavy_minus_sign:                                                                                                                                            | If true, an admin can delete this organization with the Frontend API.                                                                                         |
\ No newline at end of file
+| Field                                                                                                       | Type                                                                                                        | Required                                                                                                    | Description                                                                                                 |
+| ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
+| `publicMetadata`                                                                                            | [Optional<UpdateOrganizationPublicMetadata>](../../models/operations/UpdateOrganizationPublicMetadata.md)   | :heavy_minus_sign:                                                                                          | Metadata saved on the organization, that is visible to both your frontend and backend.                      |
+| `privateMetadata`                                                                                           | [Optional<UpdateOrganizationPrivateMetadata>](../../models/operations/UpdateOrganizationPrivateMetadata.md) | :heavy_minus_sign:                                                                                          | Metadata saved on the organization that is only visible to your backend.                                    |
+| `name`                                                                                                      | *JsonNullable<String>*                                                                                      | :heavy_minus_sign:                                                                                          | The new name of the organization                                                                            |
+| `slug`                                                                                                      | *JsonNullable<String>*                                                                                      | :heavy_minus_sign:                                                                                          | The new slug of the organization, which needs to be unique in the instance                                  |
+| `maxAllowedMemberships`                                                                                     | *JsonNullable<Long>*                                                                                        | :heavy_minus_sign:                                                                                          | The maximum number of memberships allowed for this organization                                             |
+| `adminDeleteEnabled`                                                                                        | *JsonNullable<Boolean>*                                                                                     | :heavy_minus_sign:                                                                                          | If true, an admin can delete this organization with the Frontend API.                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateOrganizationResponse.md b/docs/models/operations/UpdateOrganizationResponse.md
index 2db9090..65567a5 100644
--- a/docs/models/operations/UpdateOrganizationResponse.md
+++ b/docs/models/operations/UpdateOrganizationResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `organization`                                                                                                                | [Optional<? extends com.clerk.backend_api.models.components.Organization>](../../models/components/Organization.md)           | :heavy_minus_sign:                                                                                                            | An organization                                                                                                               |
\ No newline at end of file
+| `organization`                                                                                                                | [Optional<Organization>](../../models/components/Organization.md)                                                             | :heavy_minus_sign:                                                                                                            | An organization                                                                                                               |
\ No newline at end of file
diff --git a/docs/models/operations/UpdatePhoneNumberRequest.md b/docs/models/operations/UpdatePhoneNumberRequest.md
index e566d5b..c3c773f 100644
--- a/docs/models/operations/UpdatePhoneNumberRequest.md
+++ b/docs/models/operations/UpdatePhoneNumberRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                               | Type                                                                                                                                                | Required                                                                                                                                            | Description                                                                                                                                         |
-| --------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `phoneNumberId`                                                                                                                                     | *String*                                                                                                                                            | :heavy_check_mark:                                                                                                                                  | The ID of the phone number to update                                                                                                                |
-| `requestBody`                                                                                                                                       | [Optional<? extends com.clerk.backend_api.models.operations.UpdatePhoneNumberRequestBody>](../../models/operations/UpdatePhoneNumberRequestBody.md) | :heavy_minus_sign:                                                                                                                                  | N/A                                                                                                                                                 |
\ No newline at end of file
+| Field                                                                                             | Type                                                                                              | Required                                                                                          | Description                                                                                       |
+| ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
+| `phoneNumberId`                                                                                   | *String*                                                                                          | :heavy_check_mark:                                                                                | The ID of the phone number to update                                                              |
+| `requestBody`                                                                                     | [Optional<UpdatePhoneNumberRequestBody>](../../models/operations/UpdatePhoneNumberRequestBody.md) | :heavy_minus_sign:                                                                                | N/A                                                                                               |
\ No newline at end of file
diff --git a/docs/models/operations/UpdatePhoneNumberRequestBody.md b/docs/models/operations/UpdatePhoneNumberRequestBody.md
index 50ab521..1adfcde 100644
--- a/docs/models/operations/UpdatePhoneNumberRequestBody.md
+++ b/docs/models/operations/UpdatePhoneNumberRequestBody.md
@@ -5,6 +5,6 @@
 
 | Field                                                                                                                                                                                                                | Type                                                                                                                                                                                                                 | Required                                                                                                                                                                                                             | Description                                                                                                                                                                                                          |
 | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `verified`                                                                                                                                                                                                           | *JsonNullable<? extends Boolean>*                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                   | The phone number will be marked as verified.                                                                                                                                                                         |
-| `primary`                                                                                                                                                                                                            | *JsonNullable<? extends Boolean>*                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                   | Set this phone number as the primary phone number for the user.                                                                                                                                                      |
-| `reservedForSecondFactor`                                                                                                                                                                                            | *JsonNullable<? extends Boolean>*                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                   | Set this phone number as reserved for multi-factor authentication.<br/>The phone number must also be verified.<br/>If there are no other reserved second factors, the phone number will be set as the default second factor. |
\ No newline at end of file
+| `verified`                                                                                                                                                                                                           | *JsonNullable<Boolean>*                                                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                                                   | The phone number will be marked as verified.                                                                                                                                                                         |
+| `primary`                                                                                                                                                                                                            | *JsonNullable<Boolean>*                                                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                                                   | Set this phone number as the primary phone number for the user.                                                                                                                                                      |
+| `reservedForSecondFactor`                                                                                                                                                                                            | *JsonNullable<Boolean>*                                                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                                                   | Set this phone number as reserved for multi-factor authentication.<br/>The phone number must also be verified.<br/>If there are no other reserved second factors, the phone number will be set as the default second factor. |
\ No newline at end of file
diff --git a/docs/models/operations/UpdatePhoneNumberResponse.md b/docs/models/operations/UpdatePhoneNumberResponse.md
index 0c04f50..3a75d4b 100644
--- a/docs/models/operations/UpdatePhoneNumberResponse.md
+++ b/docs/models/operations/UpdatePhoneNumberResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `phoneNumber`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.PhoneNumber>](../../models/components/PhoneNumber.md)             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `phoneNumber`                                                                                                                 | [Optional<PhoneNumber>](../../models/components/PhoneNumber.md)                                                               | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateProductionInstanceDomainRequestBody.md b/docs/models/operations/UpdateProductionInstanceDomainRequestBody.md
index dfb8fea..943784c 100644
--- a/docs/models/operations/UpdateProductionInstanceDomainRequestBody.md
+++ b/docs/models/operations/UpdateProductionInstanceDomainRequestBody.md
@@ -5,4 +5,4 @@
 
 | Field                                                                    | Type                                                                     | Required                                                                 | Description                                                              |
 | ------------------------------------------------------------------------ | ------------------------------------------------------------------------ | ------------------------------------------------------------------------ | ------------------------------------------------------------------------ |
-| `homeUrl`                                                                | *Optional<? extends String>*                                             | :heavy_minus_sign:                                                       | The new home URL of the production instance e.g. https://www.example.com |
\ No newline at end of file
+| `homeUrl`                                                                | *Optional<String>*                                                       | :heavy_minus_sign:                                                       | The new home URL of the production instance e.g. https://www.example.com |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateSAMLConnectionAttributeMapping.md b/docs/models/operations/UpdateSAMLConnectionAttributeMapping.md
index 36ceeb3..b53f284 100644
--- a/docs/models/operations/UpdateSAMLConnectionAttributeMapping.md
+++ b/docs/models/operations/UpdateSAMLConnectionAttributeMapping.md
@@ -5,9 +5,9 @@ Define the atrtibute name mapping between Identity Provider and Clerk's user pro
 
 ## Fields
 
-| Field                        | Type                         | Required                     | Description                  |
-| ---------------------------- | ---------------------------- | ---------------------------- | ---------------------------- |
-| `userId`                     | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
-| `emailAddress`               | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
-| `firstName`                  | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
-| `lastName`                   | *Optional<? extends String>* | :heavy_minus_sign:           | N/A                          |
\ No newline at end of file
+| Field              | Type               | Required           | Description        |
+| ------------------ | ------------------ | ------------------ | ------------------ |
+| `userId`           | *Optional<String>* | :heavy_minus_sign: | N/A                |
+| `emailAddress`     | *Optional<String>* | :heavy_minus_sign: | N/A                |
+| `firstName`        | *Optional<String>* | :heavy_minus_sign: | N/A                |
+| `lastName`         | *Optional<String>* | :heavy_minus_sign: | N/A                |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateSAMLConnectionRequest.md b/docs/models/operations/UpdateSAMLConnectionRequest.md
index 786ab81..364b971 100644
--- a/docs/models/operations/UpdateSAMLConnectionRequest.md
+++ b/docs/models/operations/UpdateSAMLConnectionRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                 | Type                                                                                                                                  | Required                                                                                                                              | Description                                                                                                                           |
-| ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
-| `samlConnectionId`                                                                                                                    | *String*                                                                                                                              | :heavy_check_mark:                                                                                                                    | The ID of the SAML Connection to update                                                                                               |
-| `requestBody`                                                                                                                         | [com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequestBody](../../models/operations/UpdateSAMLConnectionRequestBody.md) | :heavy_check_mark:                                                                                                                    | N/A                                                                                                                                   |
\ No newline at end of file
+| Field                                                                                         | Type                                                                                          | Required                                                                                      | Description                                                                                   |
+| --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- |
+| `samlConnectionId`                                                                            | *String*                                                                                      | :heavy_check_mark:                                                                            | The ID of the SAML Connection to update                                                       |
+| `requestBody`                                                                                 | [UpdateSAMLConnectionRequestBody](../../models/operations/UpdateSAMLConnectionRequestBody.md) | :heavy_check_mark:                                                                            | N/A                                                                                           |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateSAMLConnectionRequestBody.md b/docs/models/operations/UpdateSAMLConnectionRequestBody.md
index d12ae89..2e19438 100644
--- a/docs/models/operations/UpdateSAMLConnectionRequestBody.md
+++ b/docs/models/operations/UpdateSAMLConnectionRequestBody.md
@@ -3,17 +3,17 @@
 
 ## Fields
 
-| Field                                                                                                                                                                   | Type                                                                                                                                                                    | Required                                                                                                                                                                | Description                                                                                                                                                             |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `name`                                                                                                                                                                  | *JsonNullable<? extends String>*                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                      | The name of the new SAML Connection                                                                                                                                     |
-| `domain`                                                                                                                                                                | *JsonNullable<? extends String>*                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                      | The domain to use for the new SAML Connection                                                                                                                           |
-| `idpEntityId`                                                                                                                                                           | *JsonNullable<? extends String>*                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                      | The entity id as provided by the IdP                                                                                                                                    |
-| `idpSsoUrl`                                                                                                                                                             | *JsonNullable<? extends String>*                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                      | The SSO url as provided by the IdP                                                                                                                                      |
-| `idpCertificate`                                                                                                                                                        | *JsonNullable<? extends String>*                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                      | The x509 certificated as provided by the IdP                                                                                                                            |
-| `idpMetadataUrl`                                                                                                                                                        | *JsonNullable<? extends String>*                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                      | The URL which serves the IdP metadata. If present, it takes priority over the corresponding individual properties and replaces them                                     |
-| `idpMetadata`                                                                                                                                                           | *JsonNullable<? extends String>*                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                      | The XML content of the IdP metadata file. If present, it takes priority over the corresponding individual properties                                                    |
-| `attributeMapping`                                                                                                                                                      | [JsonNullable<? extends com.clerk.backend_api.models.operations.UpdateSAMLConnectionAttributeMapping>](../../models/operations/UpdateSAMLConnectionAttributeMapping.md) | :heavy_minus_sign:                                                                                                                                                      | Define the atrtibute name mapping between Identity Provider and Clerk's user properties                                                                                 |
-| `active`                                                                                                                                                                | *JsonNullable<? extends Boolean>*                                                                                                                                       | :heavy_minus_sign:                                                                                                                                                      | Activate or de-activate the SAML Connection                                                                                                                             |
-| `syncUserAttributes`                                                                                                                                                    | *JsonNullable<? extends Boolean>*                                                                                                                                       | :heavy_minus_sign:                                                                                                                                                      | Controls whether to update the user's attributes in each sign-in                                                                                                        |
-| `allowSubdomains`                                                                                                                                                       | *JsonNullable<? extends Boolean>*                                                                                                                                       | :heavy_minus_sign:                                                                                                                                                      | Allow users with an email address subdomain to use this connection in order to authenticate                                                                             |
-| `allowIdpInitiated`                                                                                                                                                     | *JsonNullable<? extends Boolean>*                                                                                                                                       | :heavy_minus_sign:                                                                                                                                                      | Enable or deactivate IdP-initiated flows                                                                                                                                |
\ No newline at end of file
+| Field                                                                                                                               | Type                                                                                                                                | Required                                                                                                                            | Description                                                                                                                         |
+| ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
+| `name`                                                                                                                              | *JsonNullable<String>*                                                                                                              | :heavy_minus_sign:                                                                                                                  | The name of the new SAML Connection                                                                                                 |
+| `domain`                                                                                                                            | *JsonNullable<String>*                                                                                                              | :heavy_minus_sign:                                                                                                                  | The domain to use for the new SAML Connection                                                                                       |
+| `idpEntityId`                                                                                                                       | *JsonNullable<String>*                                                                                                              | :heavy_minus_sign:                                                                                                                  | The entity id as provided by the IdP                                                                                                |
+| `idpSsoUrl`                                                                                                                         | *JsonNullable<String>*                                                                                                              | :heavy_minus_sign:                                                                                                                  | The SSO url as provided by the IdP                                                                                                  |
+| `idpCertificate`                                                                                                                    | *JsonNullable<String>*                                                                                                              | :heavy_minus_sign:                                                                                                                  | The x509 certificated as provided by the IdP                                                                                        |
+| `idpMetadataUrl`                                                                                                                    | *JsonNullable<String>*                                                                                                              | :heavy_minus_sign:                                                                                                                  | The URL which serves the IdP metadata. If present, it takes priority over the corresponding individual properties and replaces them |
+| `idpMetadata`                                                                                                                       | *JsonNullable<String>*                                                                                                              | :heavy_minus_sign:                                                                                                                  | The XML content of the IdP metadata file. If present, it takes priority over the corresponding individual properties                |
+| `attributeMapping`                                                                                                                  | [JsonNullable<UpdateSAMLConnectionAttributeMapping>](../../models/operations/UpdateSAMLConnectionAttributeMapping.md)               | :heavy_minus_sign:                                                                                                                  | Define the atrtibute name mapping between Identity Provider and Clerk's user properties                                             |
+| `active`                                                                                                                            | *JsonNullable<Boolean>*                                                                                                             | :heavy_minus_sign:                                                                                                                  | Activate or de-activate the SAML Connection                                                                                         |
+| `syncUserAttributes`                                                                                                                | *JsonNullable<Boolean>*                                                                                                             | :heavy_minus_sign:                                                                                                                  | Controls whether to update the user's attributes in each sign-in                                                                    |
+| `allowSubdomains`                                                                                                                   | *JsonNullable<Boolean>*                                                                                                             | :heavy_minus_sign:                                                                                                                  | Allow users with an email address subdomain to use this connection in order to authenticate                                         |
+| `allowIdpInitiated`                                                                                                                 | *JsonNullable<Boolean>*                                                                                                             | :heavy_minus_sign:                                                                                                                  | Enable or deactivate IdP-initiated flows                                                                                            |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateSAMLConnectionResponse.md b/docs/models/operations/UpdateSAMLConnectionResponse.md
index 164e347..e5e46ce 100644
--- a/docs/models/operations/UpdateSAMLConnectionResponse.md
+++ b/docs/models/operations/UpdateSAMLConnectionResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `samlConnection`                                                                                                              | [Optional<? extends com.clerk.backend_api.models.components.SAMLConnection>](../../models/components/SAMLConnection.md)       | :heavy_minus_sign:                                                                                                            | A SAML Connection                                                                                                             |
\ No newline at end of file
+| `samlConnection`                                                                                                              | [Optional<SAMLConnection>](../../models/components/SAMLConnection.md)                                                         | :heavy_minus_sign:                                                                                                            | A SAML Connection                                                                                                             |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateSignUpRequest.md b/docs/models/operations/UpdateSignUpRequest.md
index 8c69766..c13163a 100644
--- a/docs/models/operations/UpdateSignUpRequest.md
+++ b/docs/models/operations/UpdateSignUpRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
-| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `id`                                                                                                                                      | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | The ID of the sign-up to update                                                                                                           |
-| `requestBody`                                                                                                                             | [Optional<? extends com.clerk.backend_api.models.operations.UpdateSignUpRequestBody>](../../models/operations/UpdateSignUpRequestBody.md) | :heavy_minus_sign:                                                                                                                        | N/A                                                                                                                                       |
\ No newline at end of file
+| Field                                                                                   | Type                                                                                    | Required                                                                                | Description                                                                             |
+| --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
+| `id`                                                                                    | *String*                                                                                | :heavy_check_mark:                                                                      | The ID of the sign-up to update                                                         |
+| `requestBody`                                                                           | [Optional<UpdateSignUpRequestBody>](../../models/operations/UpdateSignUpRequestBody.md) | :heavy_minus_sign:                                                                      | N/A                                                                                     |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateSignUpRequestBody.md b/docs/models/operations/UpdateSignUpRequestBody.md
index a072f44..79568f9 100644
--- a/docs/models/operations/UpdateSignUpRequestBody.md
+++ b/docs/models/operations/UpdateSignUpRequestBody.md
@@ -5,5 +5,5 @@
 
 | Field                                                                                                                                                                                                                                                                                                                                                      | Type                                                                                                                                                                                                                                                                                                                                                       | Required                                                                                                                                                                                                                                                                                                                                                   | Description                                                                                                                                                                                                                                                                                                                                                |
 | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `customAction`                                                                                                                                                                                                                                                                                                                                             | *Optional<? extends Boolean>*                                                                                                                                                                                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                         | Specifies whether a custom action has run for this sign-up attempt.<br/>This is important when your instance has been configured to require a custom action to run before converting a sign-up into a user.<br/>After executing any external business logic you deem necessary, you can mark the sign-up as ready-to-convert by setting `custom_action` to `true`. |
-| `externalId`                                                                                                                                                                                                                                                                                                                                               | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                         | The ID of the guest attempting to sign up as used in your external systems or your previous authentication solution.<br/>This will be copied to the resulting user when the sign-up is completed.                                                                                                                                                          |
\ No newline at end of file
+| `customAction`                                                                                                                                                                                                                                                                                                                                             | *Optional<Boolean>*                                                                                                                                                                                                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                         | Specifies whether a custom action has run for this sign-up attempt.<br/>This is important when your instance has been configured to require a custom action to run before converting a sign-up into a user.<br/>After executing any external business logic you deem necessary, you can mark the sign-up as ready-to-convert by setting `custom_action` to `true`. |
+| `externalId`                                                                                                                                                                                                                                                                                                                                               | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                         | The ID of the guest attempting to sign up as used in your external systems or your previous authentication solution.<br/>This will be copied to the resulting user when the sign-up is completed.                                                                                                                                                          |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateSignUpResponse.md b/docs/models/operations/UpdateSignUpResponse.md
index 93490a5..af981d0 100644
--- a/docs/models/operations/UpdateSignUpResponse.md
+++ b/docs/models/operations/UpdateSignUpResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `signUp`                                                                                                                      | [Optional<? extends com.clerk.backend_api.models.components.SignUp>](../../models/components/SignUp.md)                       | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `signUp`                                                                                                                      | [Optional<SignUp>](../../models/components/SignUp.md)                                                                         | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateUserMetadataRequest.md b/docs/models/operations/UpdateUserMetadataRequest.md
index 6dc1006..feed21a 100644
--- a/docs/models/operations/UpdateUserMetadataRequest.md
+++ b/docs/models/operations/UpdateUserMetadataRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                                 | Type                                                                                                                                                  | Required                                                                                                                                              | Description                                                                                                                                           |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `userId`                                                                                                                                              | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The ID of the user whose metadata will be updated and merged                                                                                          |
-| `requestBody`                                                                                                                                         | [Optional<? extends com.clerk.backend_api.models.operations.UpdateUserMetadataRequestBody>](../../models/operations/UpdateUserMetadataRequestBody.md) | :heavy_minus_sign:                                                                                                                                    | N/A                                                                                                                                                   |
\ No newline at end of file
+| Field                                                                                               | Type                                                                                                | Required                                                                                            | Description                                                                                         |
+| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
+| `userId`                                                                                            | *String*                                                                                            | :heavy_check_mark:                                                                                  | The ID of the user whose metadata will be updated and merged                                        |
+| `requestBody`                                                                                       | [Optional<UpdateUserMetadataRequestBody>](../../models/operations/UpdateUserMetadataRequestBody.md) | :heavy_minus_sign:                                                                                  | N/A                                                                                                 |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateUserMetadataRequestBody.md b/docs/models/operations/UpdateUserMetadataRequestBody.md
index 08d977c..07ebea7 100644
--- a/docs/models/operations/UpdateUserMetadataRequestBody.md
+++ b/docs/models/operations/UpdateUserMetadataRequestBody.md
@@ -5,6 +5,6 @@
 
 | Field                                                                                                                                                                                                                                      | Type                                                                                                                                                                                                                                       | Required                                                                                                                                                                                                                                   | Description                                                                                                                                                                                                                                |
 | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `publicMetadata`                                                                                                                                                                                                                           | [Optional<? extends com.clerk.backend_api.models.operations.UpdateUserMetadataPublicMetadata>](../../models/operations/UpdateUserMetadataPublicMetadata.md)                                                                                | :heavy_minus_sign:                                                                                                                                                                                                                         | Metadata saved on the user, that is visible to both your frontend and backend.<br/>The new object will be merged with the existing value.                                                                                                  |
-| `privateMetadata`                                                                                                                                                                                                                          | [Optional<? extends com.clerk.backend_api.models.operations.UpdateUserMetadataPrivateMetadata>](../../models/operations/UpdateUserMetadataPrivateMetadata.md)                                                                              | :heavy_minus_sign:                                                                                                                                                                                                                         | Metadata saved on the user that is only visible to your backend.<br/>The new object will be merged with the existing value.                                                                                                                |
-| `unsafeMetadata`                                                                                                                                                                                                                           | [Optional<? extends com.clerk.backend_api.models.operations.UpdateUserMetadataUnsafeMetadata>](../../models/operations/UpdateUserMetadataUnsafeMetadata.md)                                                                                | :heavy_minus_sign:                                                                                                                                                                                                                         | Metadata saved on the user, that can be updated from both the Frontend and Backend APIs.<br/>The new object will be merged with the existing value.<br/><br/>Note: Since this data can be modified from the frontend, it is not guaranteed to be safe. |
\ No newline at end of file
+| `publicMetadata`                                                                                                                                                                                                                           | [Optional<UpdateUserMetadataPublicMetadata>](../../models/operations/UpdateUserMetadataPublicMetadata.md)                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                         | Metadata saved on the user, that is visible to both your frontend and backend.<br/>The new object will be merged with the existing value.                                                                                                  |
+| `privateMetadata`                                                                                                                                                                                                                          | [Optional<UpdateUserMetadataPrivateMetadata>](../../models/operations/UpdateUserMetadataPrivateMetadata.md)                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                                         | Metadata saved on the user that is only visible to your backend.<br/>The new object will be merged with the existing value.                                                                                                                |
+| `unsafeMetadata`                                                                                                                                                                                                                           | [Optional<UpdateUserMetadataUnsafeMetadata>](../../models/operations/UpdateUserMetadataUnsafeMetadata.md)                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                         | Metadata saved on the user, that can be updated from both the Frontend and Backend APIs.<br/>The new object will be merged with the existing value.<br/><br/>Note: Since this data can be modified from the frontend, it is not guaranteed to be safe. |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateUserMetadataResponse.md b/docs/models/operations/UpdateUserMetadataResponse.md
index fea9bd9..d5eab12 100644
--- a/docs/models/operations/UpdateUserMetadataResponse.md
+++ b/docs/models/operations/UpdateUserMetadataResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `user`                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.components.User>](../../models/components/User.md)                           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `user`                                                                                                                        | [Optional<User>](../../models/components/User.md)                                                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateUserRequest.md b/docs/models/operations/UpdateUserRequest.md
index 825e91f..fba5f0c 100644
--- a/docs/models/operations/UpdateUserRequest.md
+++ b/docs/models/operations/UpdateUserRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                             | Type                                                                                                              | Required                                                                                                          | Description                                                                                                       |
-| ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
-| `userId`                                                                                                          | *String*                                                                                                          | :heavy_check_mark:                                                                                                | The ID of the user to update                                                                                      |
-| `requestBody`                                                                                                     | [com.clerk.backend_api.models.operations.UpdateUserRequestBody](../../models/operations/UpdateUserRequestBody.md) | :heavy_check_mark:                                                                                                | N/A                                                                                                               |
\ No newline at end of file
+| Field                                                                     | Type                                                                      | Required                                                                  | Description                                                               |
+| ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- |
+| `userId`                                                                  | *String*                                                                  | :heavy_check_mark:                                                        | The ID of the user to update                                              |
+| `requestBody`                                                             | [UpdateUserRequestBody](../../models/operations/UpdateUserRequestBody.md) | :heavy_check_mark:                                                        | N/A                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateUserRequestBody.md b/docs/models/operations/UpdateUserRequestBody.md
index b22a317..cfa9eb4 100644
--- a/docs/models/operations/UpdateUserRequestBody.md
+++ b/docs/models/operations/UpdateUserRequestBody.md
@@ -5,25 +5,25 @@
 
 | Field                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | Type                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Required                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `externalId`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The ID of the user as used in your external systems or your previous authentication solution.<br/>Must be unique across your instance.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `firstName`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The first name to assign to the user                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-| `lastName`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The last name to assign to the user                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `primaryEmailAddressId`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | *Optional<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The ID of the email address to set as primary.<br/>It must be verified, and present on the current user.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `notifyPrimaryEmailAddressChanged`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | *Optional<? extends Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | If set to `true`, the user will be notified that their primary email address has changed.<br/>By default, no notification is sent.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-| `primaryPhoneNumberId`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | *Optional<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The ID of the phone number to set as primary.<br/>It must be verified, and present on the current user.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| `primaryWeb3WalletId`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | *Optional<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The ID of the web3 wallets to set as primary.<br/>It must be verified, and present on the current user.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| `username`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The username to give to the user.<br/>It must be unique across your instance.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| `profileImageId`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The ID of the image to set as the user's profile image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `password`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | *JsonNullable<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The plaintext password to give the user.<br/>Must be at least 8 characters long, and can not be in any list of hacked passwords.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `passwordDigest`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | *Optional<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | In case you already have the password digests and not the passwords, you can use them for the newly created user via this property.<br/>The digests should be generated with one of the supported algorithms.<br/>The hashing algorithm can be specified using the `password_hasher` property.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| `passwordHasher`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | [Optional<? extends com.clerk.backend_api.models.operations.UpdateUserPasswordHasher>](../../models/operations/UpdateUserPasswordHasher.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The hashing algorithm that was used to generate the password digest.<br/>The algorithms we support at the moment are [bcrypt](https://en.wikipedia.org/wiki/Bcrypt), [bcrypt_sha256_django](https://docs.djangoproject.com/en/4.0/topics/auth/passwords/),<br/>[md5](https://en.wikipedia.org/wiki/MD5), pbkdf2_sha256, pbkdf2_sha512, [pbkdf2_sha256_django](https://docs.djangoproject.com/en/4.0/topics/auth/passwords/),<br/>[phpass](https://www.openwall.com/phpass/), [scrypt_firebase](https://firebaseopensource.com/projects/firebase/scrypt/),<br/>[sha256](https://en.wikipedia.org/wiki/SHA-2), [scrypt_werkzeug](https://werkzeug.palletsprojects.com/en/3.0.x/utils/#werkzeug.security.generate_password_hash)<br/>and the [argon2](https://argon2.online/) variants argon2i and argon2id.<br/><br/>If you need support for any particular hashing algorithm, [please let us know](https://clerk.com/support).<br/><br/>Note: for password hashers considered insecure (at this moment MD5 and SHA256), the corresponding user password hashes will be transparently migrated to Bcrypt (a secure hasher) upon the user's first successful password sign in.<br/>Insecure schemes are marked with `(insecure)` in the list below.<br/><br/>Each of the supported hashers expects the incoming digest to be in a particular format. Specifically:<br/><br/>**bcrypt:** The digest should be of the following form:<br/><br/>`$<algorithm version>$<cost>$<salt & hash>`<br/><br/>**bcrypt_sha256_django:** This is the Django-specific variant of Bcrypt, using SHA256 hashing function. The format should be as follows (as exported from Django):<br/><br/>`bcrypt_sha256$$<algorithm version>$<cost>$<salt & hash>`<br/><br/>**md5** (insecure): The digest should follow the regular form e.g.:<br/><br/>`5f4dcc3b5aa765d61d8327deb882cf99`<br/><br/>**pbkdf2_sha256:** This is the PBKDF2 algorithm using the SHA256 hashing function. The format should be as follows:<br/><br/>`pbkdf2_sha256$<iterations>$<salt>$<hash>`<br/><br/>Note: Both the salt and the hash are expected to be base64-encoded.<br/><br/>**pbkdf2_sha512:** This is the PBKDF2 algorithm using the SHA512 hashing function. The format should be as follows:<br/><br/>`pbkdf2_sha512$<iterations>$<salt>$<hash>`<br/><br/>  _iterations:_ The number of iterations used. Must be an integer less than 420000.<br/>  _salt:_ The salt used when generating the hash. Must be less than bytes.<br/>  _hash:_ The hex-encoded hash. Must have been generated with a key length less than 1024 bytes.<br/><br/>**pbkdf2_sha256_django:** This is the Django-specific variant of PBKDF2 and the digest should have the following format (as exported from Django):<br/><br/>`pbkdf2_sha256$<iterations>$<salt>$<hash>`<br/><br/>Note: The salt is expected to be un-encoded, the hash is expected base64-encoded.<br/><br/>**pbkdf2_sha1:** This is similar to pkbdf2_sha256_django, but with two differences:<br/>1. uses sha1 instead of sha256<br/>2. accepts the hash as a hex-encoded string<br/><br/>The format is the following:<br/><br/>`pbkdf2_sha1$<iterations>$<salt>$<hash-as-hex-string>`<br/><br/>**phpass:** Portable public domain password hashing framework for use in PHP applications. Digests hashed with phpass have the following sections:<br/><br/>The format is the following:<br/><br/>`$P$<rounds><salt><encoded-checksum>`<br/><br/>- $P$ is the prefix used to identify phpass hashes.<br/>- rounds is a single character encoding a 6-bit integer representing the number of rounds used.<br/>- salt is eight characters drawn from [./0-9A-Za-z], providing a 48-bit salt.<br/>- checksum is 22 characters drawn from the same set, encoding the 128-bit checksum with MD5.<br/><br/>**scrypt_firebase:** The Firebase-specific variant of scrypt.<br/>The value is expected to have 6 segments separated by the $ character and include the following information:<br/><br/>_hash:_ The actual Base64 hash. This can be retrieved when exporting the user from Firebase.<br/>_salt:_ The salt used to generate the above hash. Again, this is given when exporting the user.<br/>_signer key:_ The base64 encoded signer key.<br/>_salt separator:_ The base64 encoded salt separator.<br/>_rounds:_ The number of rounds the algorithm needs to run.<br/>_memory cost:_ The cost of the algorithm run<br/><br/>The first 2 (hash and salt) are per user and can be retrieved when exporting the user from Firebase.<br/>The other 4 values (signer key, salt separator, rounds and memory cost) are project-wide settings and can be retrieved from the project's password hash parameters.<br/><br/>Once you have all these, you can combine it in the following format and send this as the digest in order for Clerk to accept it:<br/><br/>`<hash>$<salt>$<signer key>$<salt separator>$<rounds>$<memory cost>`<br/><br/>**scrypt_werkzeug:** The Werkzeug-specific variant of scrypt.<br/><br/>The value is expected to have 3 segments separated by the $ character and include the following information:<br/><br/>_algorithm args:_ The algorithm used to generate the hash.<br/>_salt:_ The salt used to generate the above hash.<br/>_hash:_ The actual Base64 hash.<br/><br/>The algorithm args are the parameters used to generate the hash and are included in the digest.<br/><br/>**argon2i:** Algorithms in the argon2 family generate digests that encode the following information:<br/><br/>_version (v):_ The argon version, version 19 is assumed<br/>_memory (m):_ The memory used by the algorithm (in kibibytes)<br/>_iterations (t):_ The number of iterations to perform<br/>_parallelism (p):_ The number of threads to use<br/><br/>Parts are demarcated by the `$` character, with the first part identifying the algorithm variant.<br/>The middle part is a comma-separated list of the encoding options (memory, iterations, parallelism).<br/>The final part is the actual digest.<br/><br/>`$argon2i$v=19$m=4096,t=3,p=1$4t6CL3P7YiHBtwESXawI8Hm20zJj4cs7/4/G3c187e0$m7RQFczcKr5bIR0IIxbpO2P0tyrLjf3eUW3M3QSwnLc`<br/><br/>**argon2id:** See the previous algorithm for an explanation of the formatting.<br/><br/>For the argon2id case, the value of the algorithm in the first part of the digest is `argon2id`:<br/><br/>`$argon2id$v=19$m=64,t=4,p=8$Z2liZXJyaXNo$iGXEpMBTDYQ8G/71tF0qGjxRHEmR3gpGULcE93zUJVU`<br/><br/>**sha256** (insecure): The digest should be a 64-length hex string, e.g.:<br/><br/>`9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08` |
-| `skipPasswordChecks`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | *JsonNullable<? extends Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Set it to `true` if you're updating the user's password and want to skip any password policy settings check. This parameter can only be used when providing a `password`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| `signOutOfOtherSessions`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | *JsonNullable<? extends Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Set to `true` to sign out the user from all their active sessions once their password is updated. This parameter can only be used when providing a `password`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| `totpSecret`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | *Optional<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | In case TOTP is configured on the instance, you can provide the secret to enable it on the specific user without the need to reset it.<br/>Please note that currently the supported options are:<br/>* Period: 30 seconds<br/>* Code length: 6 digits<br/>* Algorithm: SHA1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| `externalId`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The ID of the user as used in your external systems or your previous authentication solution.<br/>Must be unique across your instance.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| `firstName`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The first name to assign to the user                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| `lastName`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The last name to assign to the user                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+| `primaryEmailAddressId`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | *Optional<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The ID of the email address to set as primary.<br/>It must be verified, and present on the current user.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| `notifyPrimaryEmailAddressChanged`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | *Optional<Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | If set to `true`, the user will be notified that their primary email address has changed.<br/>By default, no notification is sent.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| `primaryPhoneNumberId`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | *Optional<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The ID of the phone number to set as primary.<br/>It must be verified, and present on the current user.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| `primaryWeb3WalletId`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | *Optional<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The ID of the web3 wallets to set as primary.<br/>It must be verified, and present on the current user.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| `username`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The username to give to the user.<br/>It must be unique across your instance.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| `profileImageId`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The ID of the image to set as the user's profile image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| `password`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | *JsonNullable<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The plaintext password to give the user.<br/>Must be at least 8 characters long, and can not be in any list of hacked passwords.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| `passwordDigest`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | *Optional<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | In case you already have the password digests and not the passwords, you can use them for the newly created user via this property.<br/>The digests should be generated with one of the supported algorithms.<br/>The hashing algorithm can be specified using the `password_hasher` property.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| `passwordHasher`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | [Optional<UpdateUserPasswordHasher>](../../models/operations/UpdateUserPasswordHasher.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | The hashing algorithm that was used to generate the password digest.<br/>The algorithms we support at the moment are [bcrypt](https://en.wikipedia.org/wiki/Bcrypt), [bcrypt_sha256_django](https://docs.djangoproject.com/en/4.0/topics/auth/passwords/),<br/>[md5](https://en.wikipedia.org/wiki/MD5), pbkdf2_sha256, pbkdf2_sha512, [pbkdf2_sha256_django](https://docs.djangoproject.com/en/4.0/topics/auth/passwords/),<br/>[phpass](https://www.openwall.com/phpass/), [scrypt_firebase](https://firebaseopensource.com/projects/firebase/scrypt/),<br/>[sha256](https://en.wikipedia.org/wiki/SHA-2), [scrypt_werkzeug](https://werkzeug.palletsprojects.com/en/3.0.x/utils/#werkzeug.security.generate_password_hash)<br/>and the [argon2](https://argon2.online/) variants argon2i and argon2id.<br/><br/>If you need support for any particular hashing algorithm, [please let us know](https://clerk.com/support).<br/><br/>Note: for password hashers considered insecure (at this moment MD5 and SHA256), the corresponding user password hashes will be transparently migrated to Bcrypt (a secure hasher) upon the user's first successful password sign in.<br/>Insecure schemes are marked with `(insecure)` in the list below.<br/><br/>Each of the supported hashers expects the incoming digest to be in a particular format. Specifically:<br/><br/>**bcrypt:** The digest should be of the following form:<br/><br/>`$<algorithm version>$<cost>$<salt & hash>`<br/><br/>**bcrypt_sha256_django:** This is the Django-specific variant of Bcrypt, using SHA256 hashing function. The format should be as follows (as exported from Django):<br/><br/>`bcrypt_sha256$$<algorithm version>$<cost>$<salt & hash>`<br/><br/>**md5** (insecure): The digest should follow the regular form e.g.:<br/><br/>`5f4dcc3b5aa765d61d8327deb882cf99`<br/><br/>**pbkdf2_sha256:** This is the PBKDF2 algorithm using the SHA256 hashing function. The format should be as follows:<br/><br/>`pbkdf2_sha256$<iterations>$<salt>$<hash>`<br/><br/>Note: Both the salt and the hash are expected to be base64-encoded.<br/><br/>**pbkdf2_sha512:** This is the PBKDF2 algorithm using the SHA512 hashing function. The format should be as follows:<br/><br/>`pbkdf2_sha512$<iterations>$<salt>$<hash>`<br/><br/>  _iterations:_ The number of iterations used. Must be an integer less than 420000.<br/>  _salt:_ The salt used when generating the hash. Must be less than bytes.<br/>  _hash:_ The hex-encoded hash. Must have been generated with a key length less than 1024 bytes.<br/><br/>**pbkdf2_sha256_django:** This is the Django-specific variant of PBKDF2 and the digest should have the following format (as exported from Django):<br/><br/>`pbkdf2_sha256$<iterations>$<salt>$<hash>`<br/><br/>Note: The salt is expected to be un-encoded, the hash is expected base64-encoded.<br/><br/>**pbkdf2_sha1:** This is similar to pkbdf2_sha256_django, but with two differences:<br/>1. uses sha1 instead of sha256<br/>2. accepts the hash as a hex-encoded string<br/><br/>The format is the following:<br/><br/>`pbkdf2_sha1$<iterations>$<salt>$<hash-as-hex-string>`<br/><br/>**phpass:** Portable public domain password hashing framework for use in PHP applications. Digests hashed with phpass have the following sections:<br/><br/>The format is the following:<br/><br/>`$P$<rounds><salt><encoded-checksum>`<br/><br/>- $P$ is the prefix used to identify phpass hashes.<br/>- rounds is a single character encoding a 6-bit integer representing the number of rounds used.<br/>- salt is eight characters drawn from [./0-9A-Za-z], providing a 48-bit salt.<br/>- checksum is 22 characters drawn from the same set, encoding the 128-bit checksum with MD5.<br/><br/>**scrypt_firebase:** The Firebase-specific variant of scrypt.<br/>The value is expected to have 6 segments separated by the $ character and include the following information:<br/><br/>_hash:_ The actual Base64 hash. This can be retrieved when exporting the user from Firebase.<br/>_salt:_ The salt used to generate the above hash. Again, this is given when exporting the user.<br/>_signer key:_ The base64 encoded signer key.<br/>_salt separator:_ The base64 encoded salt separator.<br/>_rounds:_ The number of rounds the algorithm needs to run.<br/>_memory cost:_ The cost of the algorithm run<br/><br/>The first 2 (hash and salt) are per user and can be retrieved when exporting the user from Firebase.<br/>The other 4 values (signer key, salt separator, rounds and memory cost) are project-wide settings and can be retrieved from the project's password hash parameters.<br/><br/>Once you have all these, you can combine it in the following format and send this as the digest in order for Clerk to accept it:<br/><br/>`<hash>$<salt>$<signer key>$<salt separator>$<rounds>$<memory cost>`<br/><br/>**scrypt_werkzeug:** The Werkzeug-specific variant of scrypt.<br/><br/>The value is expected to have 3 segments separated by the $ character and include the following information:<br/><br/>_algorithm args:_ The algorithm used to generate the hash.<br/>_salt:_ The salt used to generate the above hash.<br/>_hash:_ The actual Base64 hash.<br/><br/>The algorithm args are the parameters used to generate the hash and are included in the digest.<br/><br/>**argon2i:** Algorithms in the argon2 family generate digests that encode the following information:<br/><br/>_version (v):_ The argon version, version 19 is assumed<br/>_memory (m):_ The memory used by the algorithm (in kibibytes)<br/>_iterations (t):_ The number of iterations to perform<br/>_parallelism (p):_ The number of threads to use<br/><br/>Parts are demarcated by the `$` character, with the first part identifying the algorithm variant.<br/>The middle part is a comma-separated list of the encoding options (memory, iterations, parallelism).<br/>The final part is the actual digest.<br/><br/>`$argon2i$v=19$m=4096,t=3,p=1$4t6CL3P7YiHBtwESXawI8Hm20zJj4cs7/4/G3c187e0$m7RQFczcKr5bIR0IIxbpO2P0tyrLjf3eUW3M3QSwnLc`<br/><br/>**argon2id:** See the previous algorithm for an explanation of the formatting.<br/><br/>For the argon2id case, the value of the algorithm in the first part of the digest is `argon2id`:<br/><br/>`$argon2id$v=19$m=64,t=4,p=8$Z2liZXJyaXNo$iGXEpMBTDYQ8G/71tF0qGjxRHEmR3gpGULcE93zUJVU`<br/><br/>**sha256** (insecure): The digest should be a 64-length hex string, e.g.:<br/><br/>`9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08` |
+| `skipPasswordChecks`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | *JsonNullable<Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Set it to `true` if you're updating the user's password and want to skip any password policy settings check. This parameter can only be used when providing a `password`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| `signOutOfOtherSessions`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | *JsonNullable<Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Set to `true` to sign out the user from all their active sessions once their password is updated. This parameter can only be used when providing a `password`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| `totpSecret`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | *Optional<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | In case TOTP is configured on the instance, you can provide the secret to enable it on the specific user without the need to reset it.<br/>Please note that currently the supported options are:<br/>* Period: 30 seconds<br/>* Code length: 6 digits<br/>* Algorithm: SHA1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 | `backupCodes`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | List<*String*>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | If Backup Codes are configured on the instance, you can provide them to enable it on the specific user without the need to reset them.<br/>You must provide the backup codes in plain format or the corresponding bcrypt digest.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `publicMetadata`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | [Optional<? extends com.clerk.backend_api.models.operations.UpdateUserPublicMetadata>](../../models/operations/UpdateUserPublicMetadata.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Metadata saved on the user, that is visible to both your Frontend and Backend APIs                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-| `privateMetadata`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | [Optional<? extends com.clerk.backend_api.models.operations.UpdateUserPrivateMetadata>](../../models/operations/UpdateUserPrivateMetadata.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Metadata saved on the user, that is only visible to your Backend API                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-| `unsafeMetadata`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | [Optional<? extends com.clerk.backend_api.models.operations.UpdateUserUnsafeMetadata>](../../models/operations/UpdateUserUnsafeMetadata.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Metadata saved on the user, that can be updated from both the Frontend and Backend APIs.<br/>Note: Since this data can be modified from the frontend, it is not guaranteed to be safe.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `deleteSelfEnabled`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | *JsonNullable<? extends Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | If true, the user can delete themselves with the Frontend API.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| `createOrganizationEnabled`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | *JsonNullable<? extends Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | If true, the user can create organizations with the Frontend API.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `createdAt`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | *Optional<? extends String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | A custom date/time denoting _when_ the user signed up to the application, specified in RFC3339 format (e.g. `2012-10-20T07:15:20.902Z`).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
\ No newline at end of file
+| `publicMetadata`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | [Optional<UpdateUserPublicMetadata>](../../models/operations/UpdateUserPublicMetadata.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Metadata saved on the user, that is visible to both your Frontend and Backend APIs                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| `privateMetadata`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | [Optional<UpdateUserPrivateMetadata>](../../models/operations/UpdateUserPrivateMetadata.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Metadata saved on the user, that is only visible to your Backend API                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| `unsafeMetadata`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | [Optional<UpdateUserUnsafeMetadata>](../../models/operations/UpdateUserUnsafeMetadata.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Metadata saved on the user, that can be updated from both the Frontend and Backend APIs.<br/>Note: Since this data can be modified from the frontend, it is not guaranteed to be safe.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| `deleteSelfEnabled`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | *JsonNullable<Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | If true, the user can delete themselves with the Frontend API.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| `createOrganizationEnabled`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | *JsonNullable<Boolean>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | If true, the user can create organizations with the Frontend API.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| `createdAt`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | *Optional<String>*                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | A custom date/time denoting _when_ the user signed up to the application, specified in RFC3339 format (e.g. `2012-10-20T07:15:20.902Z`).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
\ No newline at end of file
diff --git a/docs/models/operations/UpdateUserResponse.md b/docs/models/operations/UpdateUserResponse.md
index f35334e..b27aef8 100644
--- a/docs/models/operations/UpdateUserResponse.md
+++ b/docs/models/operations/UpdateUserResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `user`                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.components.User>](../../models/components/User.md)                           | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `user`                                                                                                                        | [Optional<User>](../../models/components/User.md)                                                                             | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UploadOrganizationLogoRequest.md b/docs/models/operations/UploadOrganizationLogoRequest.md
index 80014a4..6e1ae3a 100644
--- a/docs/models/operations/UploadOrganizationLogoRequest.md
+++ b/docs/models/operations/UploadOrganizationLogoRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                                         | Type                                                                                                                                                          | Required                                                                                                                                                      | Description                                                                                                                                                   |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                              | *String*                                                                                                                                                      | :heavy_check_mark:                                                                                                                                            | The ID of the organization for which to upload a logo                                                                                                         |
-| `requestBody`                                                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.operations.UploadOrganizationLogoRequestBody>](../../models/operations/UploadOrganizationLogoRequestBody.md) | :heavy_minus_sign:                                                                                                                                            | N/A                                                                                                                                                           |
\ No newline at end of file
+| Field                                                                                                       | Type                                                                                                        | Required                                                                                                    | Description                                                                                                 |
+| ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                            | *String*                                                                                                    | :heavy_check_mark:                                                                                          | The ID of the organization for which to upload a logo                                                       |
+| `requestBody`                                                                                               | [Optional<UploadOrganizationLogoRequestBody>](../../models/operations/UploadOrganizationLogoRequestBody.md) | :heavy_minus_sign:                                                                                          | N/A                                                                                                         |
\ No newline at end of file
diff --git a/docs/models/operations/UploadOrganizationLogoRequestBody.md b/docs/models/operations/UploadOrganizationLogoRequestBody.md
index ca110fc..2ef218a 100644
--- a/docs/models/operations/UploadOrganizationLogoRequestBody.md
+++ b/docs/models/operations/UploadOrganizationLogoRequestBody.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                       | Type                                                                                                                        | Required                                                                                                                    | Description                                                                                                                 |
-| --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
-| `uploaderUserId`                                                                                                            | *String*                                                                                                                    | :heavy_check_mark:                                                                                                          | The ID of the user that will be credited with the image upload.                                                             |
-| `file`                                                                                                                      | [com.clerk.backend_api.models.operations.UploadOrganizationLogoFile](../../models/operations/UploadOrganizationLogoFile.md) | :heavy_check_mark:                                                                                                          | N/A                                                                                                                         |
\ No newline at end of file
+| Field                                                                               | Type                                                                                | Required                                                                            | Description                                                                         |
+| ----------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- |
+| `uploaderUserId`                                                                    | *String*                                                                            | :heavy_check_mark:                                                                  | The ID of the user that will be credited with the image upload.                     |
+| `file`                                                                              | [UploadOrganizationLogoFile](../../models/operations/UploadOrganizationLogoFile.md) | :heavy_check_mark:                                                                  | N/A                                                                                 |
\ No newline at end of file
diff --git a/docs/models/operations/UploadOrganizationLogoResponse.md b/docs/models/operations/UploadOrganizationLogoResponse.md
index 03dc8ed..c8b01cc 100644
--- a/docs/models/operations/UploadOrganizationLogoResponse.md
+++ b/docs/models/operations/UploadOrganizationLogoResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                               | Type                                                                                                                                | Required                                                                                                                            | Description                                                                                                                         |
-| ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                       | *String*                                                                                                                            | :heavy_check_mark:                                                                                                                  | HTTP response content type for this operation                                                                                       |
-| `statusCode`                                                                                                                        | *int*                                                                                                                               | :heavy_check_mark:                                                                                                                  | HTTP response status code for this operation                                                                                        |
-| `rawResponse`                                                                                                                       | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)       | :heavy_check_mark:                                                                                                                  | Raw HTTP response; suitable for custom response parsing                                                                             |
-| `organizationWithLogo`                                                                                                              | [Optional<? extends com.clerk.backend_api.models.components.OrganizationWithLogo>](../../models/components/OrganizationWithLogo.md) | :heavy_minus_sign:                                                                                                                  | An organization with a logo URL.                                                                                                    |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `organizationWithLogo`                                                                                                        | [Optional<OrganizationWithLogo>](../../models/components/OrganizationWithLogo.md)                                             | :heavy_minus_sign:                                                                                                            | An organization with a logo URL.                                                                                              |
\ No newline at end of file
diff --git a/docs/models/operations/UpsertTemplateRequest.md b/docs/models/operations/UpsertTemplateRequest.md
index 9a6ccd2..162aacf 100644
--- a/docs/models/operations/UpsertTemplateRequest.md
+++ b/docs/models/operations/UpsertTemplateRequest.md
@@ -3,8 +3,8 @@
 
 ## Fields
 
-| Field                                                                                                                                         | Type                                                                                                                                          | Required                                                                                                                                      | Description                                                                                                                                   |
-| --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| `templateType`                                                                                                                                | [com.clerk.backend_api.models.operations.UpsertTemplatePathParamTemplateType](../../models/operations/UpsertTemplatePathParamTemplateType.md) | :heavy_check_mark:                                                                                                                            | The type of template to update                                                                                                                |
-| `slug`                                                                                                                                        | *String*                                                                                                                                      | :heavy_check_mark:                                                                                                                            | The slug of the template to update                                                                                                            |
-| `requestBody`                                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.operations.UpsertTemplateRequestBody>](../../models/operations/UpsertTemplateRequestBody.md) | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
\ No newline at end of file
+| Field                                                                                                 | Type                                                                                                  | Required                                                                                              | Description                                                                                           |
+| ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- |
+| `templateType`                                                                                        | [UpsertTemplatePathParamTemplateType](../../models/operations/UpsertTemplatePathParamTemplateType.md) | :heavy_check_mark:                                                                                    | The type of template to update                                                                        |
+| `slug`                                                                                                | *String*                                                                                              | :heavy_check_mark:                                                                                    | The slug of the template to update                                                                    |
+| `requestBody`                                                                                         | [Optional<UpsertTemplateRequestBody>](../../models/operations/UpsertTemplateRequestBody.md)           | :heavy_minus_sign:                                                                                    | N/A                                                                                                   |
\ No newline at end of file
diff --git a/docs/models/operations/UpsertTemplateRequestBody.md b/docs/models/operations/UpsertTemplateRequestBody.md
index 7f8bdb1..469e29b 100644
--- a/docs/models/operations/UpsertTemplateRequestBody.md
+++ b/docs/models/operations/UpsertTemplateRequestBody.md
@@ -5,10 +5,10 @@
 
 | Field                                                                                                                                                                                      | Type                                                                                                                                                                                       | Required                                                                                                                                                                                   | Description                                                                                                                                                                                |
 | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `name`                                                                                                                                                                                     | *Optional<? extends String>*                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                         | The user-friendly name of the template                                                                                                                                                     |
-| `subject`                                                                                                                                                                                  | *JsonNullable<? extends String>*                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                         | The email subject.<br/>Applicable only to email templates.                                                                                                                                 |
-| `markup`                                                                                                                                                                                   | *JsonNullable<? extends String>*                                                                                                                                                           | :heavy_minus_sign:                                                                                                                                                                         | The editor markup used to generate the body of the template                                                                                                                                |
-| `body`                                                                                                                                                                                     | *Optional<? extends String>*                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                         | The template body before variable interpolation                                                                                                                                            |
-| `deliveredByClerk`                                                                                                                                                                         | *JsonNullable<? extends Boolean>*                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                         | Whether Clerk should deliver emails or SMS messages based on the current template                                                                                                          |
-| `fromEmailName`                                                                                                                                                                            | *Optional<? extends String>*                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                         | The local part of the From email address that will be used for emails.<br/>For example, in the address 'hello@example.com', the local part is 'hello'.<br/>Applicable only to email templates. |
-| `replyToEmailName`                                                                                                                                                                         | *Optional<? extends String>*                                                                                                                                                               | :heavy_minus_sign:                                                                                                                                                                         | The local part of the Reply To email address that will be used for emails.<br/>For example, in the address 'hello@example.com', the local part is 'hello'.<br/>Applicable only to email templates. |
\ No newline at end of file
+| `name`                                                                                                                                                                                     | *Optional<String>*                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                         | The user-friendly name of the template                                                                                                                                                     |
+| `subject`                                                                                                                                                                                  | *JsonNullable<String>*                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                         | The email subject.<br/>Applicable only to email templates.                                                                                                                                 |
+| `markup`                                                                                                                                                                                   | *JsonNullable<String>*                                                                                                                                                                     | :heavy_minus_sign:                                                                                                                                                                         | The editor markup used to generate the body of the template                                                                                                                                |
+| `body`                                                                                                                                                                                     | *Optional<String>*                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                         | The template body before variable interpolation                                                                                                                                            |
+| `deliveredByClerk`                                                                                                                                                                         | *JsonNullable<Boolean>*                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                         | Whether Clerk should deliver emails or SMS messages based on the current template                                                                                                          |
+| `fromEmailName`                                                                                                                                                                            | *Optional<String>*                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                         | The local part of the From email address that will be used for emails.<br/>For example, in the address 'hello@example.com', the local part is 'hello'.<br/>Applicable only to email templates. |
+| `replyToEmailName`                                                                                                                                                                         | *Optional<String>*                                                                                                                                                                         | :heavy_minus_sign:                                                                                                                                                                         | The local part of the Reply To email address that will be used for emails.<br/>For example, in the address 'hello@example.com', the local part is 'hello'.<br/>Applicable only to email templates. |
\ No newline at end of file
diff --git a/docs/models/operations/UpsertTemplateResponse.md b/docs/models/operations/UpsertTemplateResponse.md
index 7029c62..b9d3fe3 100644
--- a/docs/models/operations/UpsertTemplateResponse.md
+++ b/docs/models/operations/UpsertTemplateResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `template`                                                                                                                    | [Optional<? extends com.clerk.backend_api.models.components.Template>](../../models/components/Template.md)                   | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `template`                                                                                                                    | [Optional<Template>](../../models/components/Template.md)                                                                     | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/UsersGetOrganizationMembershipsRequest.md b/docs/models/operations/UsersGetOrganizationMembershipsRequest.md
index fcb358a..bef3ca6 100644
--- a/docs/models/operations/UsersGetOrganizationMembershipsRequest.md
+++ b/docs/models/operations/UsersGetOrganizationMembershipsRequest.md
@@ -6,5 +6,5 @@
 | Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
 | `userId`                                                                                                                                  | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | The ID of the user whose organization memberships we want to retrieve                                                                     |
-| `limit`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
-| `offset`                                                                                                                                  | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
\ No newline at end of file
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
\ No newline at end of file
diff --git a/docs/models/operations/UsersGetOrganizationMembershipsResponse.md b/docs/models/operations/UsersGetOrganizationMembershipsResponse.md
index f3df469..ae6a273 100644
--- a/docs/models/operations/UsersGetOrganizationMembershipsResponse.md
+++ b/docs/models/operations/UsersGetOrganizationMembershipsResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                     | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
-| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                             | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | HTTP response content type for this operation                                                                                             |
-| `statusCode`                                                                                                                              | *int*                                                                                                                                     | :heavy_check_mark:                                                                                                                        | HTTP response status code for this operation                                                                                              |
-| `rawResponse`                                                                                                                             | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)             | :heavy_check_mark:                                                                                                                        | Raw HTTP response; suitable for custom response parsing                                                                                   |
-| `organizationMemberships`                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.components.OrganizationMemberships>](../../models/components/OrganizationMemberships.md) | :heavy_minus_sign:                                                                                                                        | A list of organization memberships                                                                                                        |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `organizationMemberships`                                                                                                     | [Optional<OrganizationMemberships>](../../models/components/OrganizationMemberships.md)                                       | :heavy_minus_sign:                                                                                                            | A list of organization memberships                                                                                            |
\ No newline at end of file
diff --git a/docs/models/operations/VerifyClientRequestBody.md b/docs/models/operations/VerifyClientRequestBody.md
index 7bdd607..2b487ff 100644
--- a/docs/models/operations/VerifyClientRequestBody.md
+++ b/docs/models/operations/VerifyClientRequestBody.md
@@ -7,4 +7,4 @@ Parameters.
 
 | Field                                          | Type                                           | Required                                       | Description                                    |
 | ---------------------------------------------- | ---------------------------------------------- | ---------------------------------------------- | ---------------------------------------------- |
-| `token`                                        | *Optional<? extends String>*                   | :heavy_minus_sign:                             | A JWT Token that represents the active client. |
\ No newline at end of file
+| `token`                                        | *Optional<String>*                             | :heavy_minus_sign:                             | A JWT Token that represents the active client. |
\ No newline at end of file
diff --git a/docs/models/operations/VerifyClientResponse.md b/docs/models/operations/VerifyClientResponse.md
index b0b2667..a1f92ca 100644
--- a/docs/models/operations/VerifyClientResponse.md
+++ b/docs/models/operations/VerifyClientResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `client`                                                                                                                      | [Optional<? extends com.clerk.backend_api.models.components.Client>](../../models/components/Client.md)                       | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `client`                                                                                                                      | [Optional<Client>](../../models/components/Client.md)                                                                         | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/VerifyDomainProxyRequestBody.md b/docs/models/operations/VerifyDomainProxyRequestBody.md
index 7e3b33c..7f75f94 100644
--- a/docs/models/operations/VerifyDomainProxyRequestBody.md
+++ b/docs/models/operations/VerifyDomainProxyRequestBody.md
@@ -5,5 +5,5 @@
 
 | Field                                                                                                                             | Type                                                                                                                              | Required                                                                                                                          | Description                                                                                                                       |
 | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| `domainId`                                                                                                                        | *Optional<? extends String>*                                                                                                      | :heavy_minus_sign:                                                                                                                | The ID of the domain that will be updated.                                                                                        |
-| `proxyUrl`                                                                                                                        | *Optional<? extends String>*                                                                                                      | :heavy_minus_sign:                                                                                                                | The full URL of the proxy which will forward requests to the Clerk Frontend API for this domain. e.g. https://example.com/__clerk |
\ No newline at end of file
+| `domainId`                                                                                                                        | *Optional<String>*                                                                                                                | :heavy_minus_sign:                                                                                                                | The ID of the domain that will be updated.                                                                                        |
+| `proxyUrl`                                                                                                                        | *Optional<String>*                                                                                                                | :heavy_minus_sign:                                                                                                                | The full URL of the proxy which will forward requests to the Clerk Frontend API for this domain. e.g. https://example.com/__clerk |
\ No newline at end of file
diff --git a/docs/models/operations/VerifyDomainProxyResponse.md b/docs/models/operations/VerifyDomainProxyResponse.md
index 656ec9e..488da83 100644
--- a/docs/models/operations/VerifyDomainProxyResponse.md
+++ b/docs/models/operations/VerifyDomainProxyResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `proxyCheck`                                                                                                                  | [Optional<? extends com.clerk.backend_api.models.components.ProxyCheck>](../../models/components/ProxyCheck.md)               | :heavy_minus_sign:                                                                                                            | Health check information about a domain's proxy configuration validation attempt.                                             |
\ No newline at end of file
+| `proxyCheck`                                                                                                                  | [Optional<ProxyCheck>](../../models/components/ProxyCheck.md)                                                                 | :heavy_minus_sign:                                                                                                            | Health check information about a domain's proxy configuration validation attempt.                                             |
\ No newline at end of file
diff --git a/docs/models/operations/VerifyPasswordRequest.md b/docs/models/operations/VerifyPasswordRequest.md
index 34580b7..6ca64a9 100644
--- a/docs/models/operations/VerifyPasswordRequest.md
+++ b/docs/models/operations/VerifyPasswordRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                         | Type                                                                                                                                          | Required                                                                                                                                      | Description                                                                                                                                   |
-| --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| `userId`                                                                                                                                      | *String*                                                                                                                                      | :heavy_check_mark:                                                                                                                            | The ID of the user for whom to verify the password                                                                                            |
-| `requestBody`                                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.operations.VerifyPasswordRequestBody>](../../models/operations/VerifyPasswordRequestBody.md) | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
\ No newline at end of file
+| Field                                                                                       | Type                                                                                        | Required                                                                                    | Description                                                                                 |
+| ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
+| `userId`                                                                                    | *String*                                                                                    | :heavy_check_mark:                                                                          | The ID of the user for whom to verify the password                                          |
+| `requestBody`                                                                               | [Optional<VerifyPasswordRequestBody>](../../models/operations/VerifyPasswordRequestBody.md) | :heavy_minus_sign:                                                                          | N/A                                                                                         |
\ No newline at end of file
diff --git a/docs/models/operations/VerifyPasswordResponse.md b/docs/models/operations/VerifyPasswordResponse.md
index 204234e..f0ef6ab 100644
--- a/docs/models/operations/VerifyPasswordResponse.md
+++ b/docs/models/operations/VerifyPasswordResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                           | Type                                                                                                                                            | Required                                                                                                                                        | Description                                                                                                                                     |
-| ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                                   | *String*                                                                                                                                        | :heavy_check_mark:                                                                                                                              | HTTP response content type for this operation                                                                                                   |
-| `statusCode`                                                                                                                                    | *int*                                                                                                                                           | :heavy_check_mark:                                                                                                                              | HTTP response status code for this operation                                                                                                    |
-| `rawResponse`                                                                                                                                   | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)                   | :heavy_check_mark:                                                                                                                              | Raw HTTP response; suitable for custom response parsing                                                                                         |
-| `object`                                                                                                                                        | [Optional<? extends com.clerk.backend_api.models.operations.VerifyPasswordResponseBody>](../../models/operations/VerifyPasswordResponseBody.md) | :heavy_minus_sign:                                                                                                                              | The provided password was correct.                                                                                                              |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `object`                                                                                                                      | [Optional<VerifyPasswordResponseBody>](../../models/operations/VerifyPasswordResponseBody.md)                                 | :heavy_minus_sign:                                                                                                            | The provided password was correct.                                                                                            |
\ No newline at end of file
diff --git a/docs/models/operations/VerifyPasswordResponseBody.md b/docs/models/operations/VerifyPasswordResponseBody.md
index ea4fb87..f813e1c 100644
--- a/docs/models/operations/VerifyPasswordResponseBody.md
+++ b/docs/models/operations/VerifyPasswordResponseBody.md
@@ -5,6 +5,6 @@ The provided password was correct.
 
 ## Fields
 
-| Field                         | Type                          | Required                      | Description                   |
-| ----------------------------- | ----------------------------- | ----------------------------- | ----------------------------- |
-| `verified`                    | *Optional<? extends Boolean>* | :heavy_minus_sign:            | N/A                           |
\ No newline at end of file
+| Field               | Type                | Required            | Description         |
+| ------------------- | ------------------- | ------------------- | ------------------- |
+| `verified`          | *Optional<Boolean>* | :heavy_minus_sign:  | N/A                 |
\ No newline at end of file
diff --git a/docs/models/operations/VerifySessionRequest.md b/docs/models/operations/VerifySessionRequest.md
index 71dc1de..b34f2c9 100644
--- a/docs/models/operations/VerifySessionRequest.md
+++ b/docs/models/operations/VerifySessionRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                       | Type                                                                                                                                        | Required                                                                                                                                    | Description                                                                                                                                 |
-| ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
-| `sessionId`                                                                                                                                 | *String*                                                                                                                                    | :heavy_check_mark:                                                                                                                          | The ID of the session                                                                                                                       |
-| `requestBody`                                                                                                                               | [Optional<? extends com.clerk.backend_api.models.operations.VerifySessionRequestBody>](../../models/operations/VerifySessionRequestBody.md) | :heavy_minus_sign:                                                                                                                          | Parameters.                                                                                                                                 |
\ No newline at end of file
+| Field                                                                                     | Type                                                                                      | Required                                                                                  | Description                                                                               |
+| ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- |
+| `sessionId`                                                                               | *String*                                                                                  | :heavy_check_mark:                                                                        | The ID of the session                                                                     |
+| `requestBody`                                                                             | [Optional<VerifySessionRequestBody>](../../models/operations/VerifySessionRequestBody.md) | :heavy_minus_sign:                                                                        | Parameters.                                                                               |
\ No newline at end of file
diff --git a/docs/models/operations/VerifySessionRequestBody.md b/docs/models/operations/VerifySessionRequestBody.md
index eab7d92..de03738 100644
--- a/docs/models/operations/VerifySessionRequestBody.md
+++ b/docs/models/operations/VerifySessionRequestBody.md
@@ -7,4 +7,4 @@ Parameters.
 
 | Field                                                                                                                               | Type                                                                                                                                | Required                                                                                                                            | Description                                                                                                                         |
 | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `token`                                                                                                                             | *Optional<? extends String>*                                                                                                        | :heavy_minus_sign:                                                                                                                  | The JWT that is sent via the `__session` cookie from your frontend.<br/>Note: this JWT must be associated with the supplied session ID. |
\ No newline at end of file
+| `token`                                                                                                                             | *Optional<String>*                                                                                                                  | :heavy_minus_sign:                                                                                                                  | The JWT that is sent via the `__session` cookie from your frontend.<br/>Note: this JWT must be associated with the supplied session ID. |
\ No newline at end of file
diff --git a/docs/models/operations/VerifySessionResponse.md b/docs/models/operations/VerifySessionResponse.md
index 214fba9..cf14a84 100644
--- a/docs/models/operations/VerifySessionResponse.md
+++ b/docs/models/operations/VerifySessionResponse.md
@@ -8,4 +8,4 @@
 | `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
 | `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
 | `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
-| `session`                                                                                                                     | [Optional<? extends com.clerk.backend_api.models.components.Session>](../../models/components/Session.md)                     | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
+| `session`                                                                                                                     | [Optional<Session>](../../models/components/Session.md)                                                                       | :heavy_minus_sign:                                                                                                            | Success                                                                                                                       |
\ No newline at end of file
diff --git a/docs/models/operations/VerifyTOTPRequest.md b/docs/models/operations/VerifyTOTPRequest.md
index 5265729..b9612e7 100644
--- a/docs/models/operations/VerifyTOTPRequest.md
+++ b/docs/models/operations/VerifyTOTPRequest.md
@@ -3,7 +3,7 @@
 
 ## Fields
 
-| Field                                                                                                                                 | Type                                                                                                                                  | Required                                                                                                                              | Description                                                                                                                           |
-| ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
-| `userId`                                                                                                                              | *String*                                                                                                                              | :heavy_check_mark:                                                                                                                    | The ID of the user for whom to verify the TOTP                                                                                        |
-| `requestBody`                                                                                                                         | [Optional<? extends com.clerk.backend_api.models.operations.VerifyTOTPRequestBody>](../../models/operations/VerifyTOTPRequestBody.md) | :heavy_minus_sign:                                                                                                                    | N/A                                                                                                                                   |
\ No newline at end of file
+| Field                                                                               | Type                                                                                | Required                                                                            | Description                                                                         |
+| ----------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- |
+| `userId`                                                                            | *String*                                                                            | :heavy_check_mark:                                                                  | The ID of the user for whom to verify the TOTP                                      |
+| `requestBody`                                                                       | [Optional<VerifyTOTPRequestBody>](../../models/operations/VerifyTOTPRequestBody.md) | :heavy_minus_sign:                                                                  | N/A                                                                                 |
\ No newline at end of file
diff --git a/docs/models/operations/VerifyTOTPResponse.md b/docs/models/operations/VerifyTOTPResponse.md
index 2c465d0..e6a8870 100644
--- a/docs/models/operations/VerifyTOTPResponse.md
+++ b/docs/models/operations/VerifyTOTPResponse.md
@@ -3,9 +3,9 @@
 
 ## Fields
 
-| Field                                                                                                                                   | Type                                                                                                                                    | Required                                                                                                                                | Description                                                                                                                             |
-| --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `contentType`                                                                                                                           | *String*                                                                                                                                | :heavy_check_mark:                                                                                                                      | HTTP response content type for this operation                                                                                           |
-| `statusCode`                                                                                                                            | *int*                                                                                                                                   | :heavy_check_mark:                                                                                                                      | HTTP response status code for this operation                                                                                            |
-| `rawResponse`                                                                                                                           | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html)           | :heavy_check_mark:                                                                                                                      | Raw HTTP response; suitable for custom response parsing                                                                                 |
-| `object`                                                                                                                                | [Optional<? extends com.clerk.backend_api.models.operations.VerifyTOTPResponseBody>](../../models/operations/VerifyTOTPResponseBody.md) | :heavy_minus_sign:                                                                                                                      | The provided TOTP or backup code was correct.                                                                                           |
\ No newline at end of file
+| Field                                                                                                                         | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `contentType`                                                                                                                 | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | HTTP response content type for this operation                                                                                 |
+| `statusCode`                                                                                                                  | *int*                                                                                                                         | :heavy_check_mark:                                                                                                            | HTTP response status code for this operation                                                                                  |
+| `rawResponse`                                                                                                                 | [HttpResponse<InputStream>](https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpResponse.html) | :heavy_check_mark:                                                                                                            | Raw HTTP response; suitable for custom response parsing                                                                       |
+| `object`                                                                                                                      | [Optional<VerifyTOTPResponseBody>](../../models/operations/VerifyTOTPResponseBody.md)                                         | :heavy_minus_sign:                                                                                                            | The provided TOTP or backup code was correct.                                                                                 |
\ No newline at end of file
diff --git a/docs/models/operations/VerifyTOTPResponseBody.md b/docs/models/operations/VerifyTOTPResponseBody.md
index e983c95..2ef2b90 100644
--- a/docs/models/operations/VerifyTOTPResponseBody.md
+++ b/docs/models/operations/VerifyTOTPResponseBody.md
@@ -5,7 +5,7 @@ The provided TOTP or backup code was correct.
 
 ## Fields
 
-| Field                                                                                                       | Type                                                                                                        | Required                                                                                                    | Description                                                                                                 |
-| ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
-| `verified`                                                                                                  | *Optional<? extends Boolean>*                                                                               | :heavy_minus_sign:                                                                                          | N/A                                                                                                         |
-| `codeType`                                                                                                  | [Optional<? extends com.clerk.backend_api.models.operations.CodeType>](../../models/operations/CodeType.md) | :heavy_minus_sign:                                                                                          | N/A                                                                                                         |
\ No newline at end of file
+| Field                                                     | Type                                                      | Required                                                  | Description                                               |
+| --------------------------------------------------------- | --------------------------------------------------------- | --------------------------------------------------------- | --------------------------------------------------------- |
+| `verified`                                                | *Optional<Boolean>*                                       | :heavy_minus_sign:                                        | N/A                                                       |
+| `codeType`                                                | [Optional<CodeType>](../../models/operations/CodeType.md) | :heavy_minus_sign:                                        | N/A                                                       |
\ No newline at end of file
diff --git a/docs/sdks/actors/README.md b/docs/sdks/actors/README.md
index 4f18875..23998ff 100644
--- a/docs/sdks/actors/README.md
+++ b/docs/sdks/actors/README.md
@@ -17,17 +17,11 @@ The `actor` parameter needs to include at least a "sub" key whose value is the I
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateActorTokenRequestBody;
+import com.clerk.backend_api.models.operations.CreateActorTokenResponse;
+import java.lang.Exception;
+import java.util.Map;
 
 public class Application {
 
@@ -39,8 +33,8 @@ public class Application {
 
             CreateActorTokenRequestBody req = CreateActorTokenRequestBody.builder()
                 .userId("<value>")
-                .actor(java.util.Map.ofEntries(
-                        entry("sub", "user_2OEpKhcCN1Lat9NQ0G6puh7q5Rb")))
+                .actor(Map.ofEntries(
+                        Map.entry("sub", "user_2OEpKhcCN1Lat9NQ0G6puh7q5Rb")))
                 .build();
 
             CreateActorTokenResponse res = sdk.actors().createToken()
@@ -53,7 +47,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -65,16 +59,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                     | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
-| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                     | [com.clerk.backend_api.models.operations.CreateActorTokenRequestBody](../../models/operations/CreateActorTokenRequestBody.md) | :heavy_check_mark:                                                                                                            | The request object to use for the request.                                                                                    |
+| Parameter                                                                             | Type                                                                                  | Required                                                                              | Description                                                                           |
+| ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
+| `request`                                                                             | [CreateActorTokenRequestBody](../../models/operations/CreateActorTokenRequestBody.md) | :heavy_check_mark:                                                                    | The request object to use for the request.                                            |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateActorTokenResponse](../../models/operations/CreateActorTokenResponse.md)**
+**[CreateActorTokenResponse](../../models/operations/CreateActorTokenResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -92,17 +88,9 @@ Revokes a pending actor token.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.RevokeActorTokenResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -122,7 +110,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -134,6 +122,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                | Type                                     | Required                                 | Description                              |
@@ -143,7 +133,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.RevokeActorTokenResponse](../../models/operations/RevokeActorTokenResponse.md)**
+**[RevokeActorTokenResponse](../../models/operations/RevokeActorTokenResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/allowlist/README.md b/docs/sdks/allowlist/README.md
index 98a2eb5..b2af451 100644
--- a/docs/sdks/allowlist/README.md
+++ b/docs/sdks/allowlist/README.md
@@ -17,17 +17,9 @@ Get a list of all identifiers allowed to sign up to an instance
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.ListAllowlistIdentifiersResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -46,7 +38,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -59,9 +51,11 @@ public class Application {
 ```
 
 
+
+
 ### Response
 
-**[com.clerk.backend_api.models.operations.ListAllowlistIdentifiersResponse](../../models/operations/ListAllowlistIdentifiersResponse.md)**
+**[ListAllowlistIdentifiersResponse](../../models/operations/ListAllowlistIdentifiersResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -79,17 +73,10 @@ Create an identifier allowed to sign up to an instance
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateAllowlistIdentifierRequestBody;
+import com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -113,7 +100,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -125,16 +112,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                       | Type                                                                                                                                            | Required                                                                                                                                        | Description                                                                                                                                     |
-| ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                                       | [com.clerk.backend_api.models.operations.CreateAllowlistIdentifierRequestBody](../../models/operations/CreateAllowlistIdentifierRequestBody.md) | :heavy_check_mark:                                                                                                                              | The request object to use for the request.                                                                                                      |
+| Parameter                                                                                               | Type                                                                                                    | Required                                                                                                | Description                                                                                             |
+| ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- |
+| `request`                                                                                               | [CreateAllowlistIdentifierRequestBody](../../models/operations/CreateAllowlistIdentifierRequestBody.md) | :heavy_check_mark:                                                                                      | The request object to use for the request.                                                              |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse](../../models/operations/CreateAllowlistIdentifierResponse.md)**
+**[CreateAllowlistIdentifierResponse](../../models/operations/CreateAllowlistIdentifierResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -152,17 +141,9 @@ Delete an identifier from the instance allow-list
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -182,7 +163,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -194,6 +175,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                              | Type                                                   | Required                                               | Description                                            |
@@ -203,7 +186,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierResponse](../../models/operations/DeleteAllowlistIdentifierResponse.md)**
+**[DeleteAllowlistIdentifierResponse](../../models/operations/DeleteAllowlistIdentifierResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/blocklist/README.md b/docs/sdks/blocklist/README.md
index 5cda28b..1f95a0b 100644
--- a/docs/sdks/blocklist/README.md
+++ b/docs/sdks/blocklist/README.md
@@ -17,17 +17,9 @@ Get a list of all identifiers which are not allowed to access an instance
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.ListBlocklistIdentifiersResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -46,7 +38,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -59,9 +51,11 @@ public class Application {
 ```
 
 
+
+
 ### Response
 
-**[com.clerk.backend_api.models.operations.ListBlocklistIdentifiersResponse](../../models/operations/ListBlocklistIdentifiersResponse.md)**
+**[ListBlocklistIdentifiersResponse](../../models/operations/ListBlocklistIdentifiersResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -79,17 +73,10 @@ Create an identifier that is blocked from accessing an instance
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateBlocklistIdentifierRequestBody;
+import com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -113,7 +100,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -125,16 +112,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                       | Type                                                                                                                                            | Required                                                                                                                                        | Description                                                                                                                                     |
-| ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                                       | [com.clerk.backend_api.models.operations.CreateBlocklistIdentifierRequestBody](../../models/operations/CreateBlocklistIdentifierRequestBody.md) | :heavy_check_mark:                                                                                                                              | The request object to use for the request.                                                                                                      |
+| Parameter                                                                                               | Type                                                                                                    | Required                                                                                                | Description                                                                                             |
+| ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- |
+| `request`                                                                                               | [CreateBlocklistIdentifierRequestBody](../../models/operations/CreateBlocklistIdentifierRequestBody.md) | :heavy_check_mark:                                                                                      | The request object to use for the request.                                                              |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse](../../models/operations/CreateBlocklistIdentifierResponse.md)**
+**[CreateBlocklistIdentifierResponse](../../models/operations/CreateBlocklistIdentifierResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -152,17 +141,9 @@ Delete an identifier from the instance block-list
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -182,7 +163,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -194,6 +175,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                              | Type                                                   | Required                                               | Description                                            |
@@ -203,7 +186,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierResponse](../../models/operations/DeleteBlocklistIdentifierResponse.md)**
+**[DeleteBlocklistIdentifierResponse](../../models/operations/DeleteBlocklistIdentifierResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/clients/README.md b/docs/sdks/clients/README.md
index 189ae55..2be5bca 100644
--- a/docs/sdks/clients/README.md
+++ b/docs/sdks/clients/README.md
@@ -21,17 +21,7 @@ Warning: the endpoint is being deprecated and will be removed in future versions
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import java.lang.Exception;
 
 public class Application {
 
@@ -61,17 +51,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                                                                                                                 | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `limit`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
-| `offset`                                                                                                                                  | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetClientListResponse](../../models/operations/GetClientListResponse.md)**
+**[GetClientListResponse](../../models/operations/GetClientListResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -89,17 +81,10 @@ Verifies the client in the provided token
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.VerifyClientRequestBody;
+import com.clerk.backend_api.models.operations.VerifyClientResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -122,7 +107,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -134,16 +119,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                             | Type                                                                                                                  | Required                                                                                                              | Description                                                                                                           |
-| --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                             | [com.clerk.backend_api.models.operations.VerifyClientRequestBody](../../models/operations/VerifyClientRequestBody.md) | :heavy_check_mark:                                                                                                    | The request object to use for the request.                                                                            |
+| Parameter                                                                     | Type                                                                          | Required                                                                      | Description                                                                   |
+| ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- |
+| `request`                                                                     | [VerifyClientRequestBody](../../models/operations/VerifyClientRequestBody.md) | :heavy_check_mark:                                                            | The request object to use for the request.                                    |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.VerifyClientResponse](../../models/operations/VerifyClientResponse.md)**
+**[VerifyClientResponse](../../models/operations/VerifyClientResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -161,17 +148,9 @@ Returns the details of a client.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetClientResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -191,7 +170,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -203,6 +182,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter          | Type               | Required           | Description        |
@@ -212,7 +193,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetClientResponse](../../models/operations/GetClientResponse.md)**
+**[GetClientResponse](../../models/operations/GetClientResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/domains/README.md b/docs/sdks/domains/README.md
index 5e084af..c80dfff 100644
--- a/docs/sdks/domains/README.md
+++ b/docs/sdks/domains/README.md
@@ -19,17 +19,9 @@ The response will contain the primary domain for the instance and any satellite
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.ListDomainsResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -45,7 +37,7 @@ public class Application {
             if (res.domains().isPresent()) {
                 // handle response
             }
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -58,9 +50,11 @@ public class Application {
 ```
 
 
+
+
 ### Response
 
-**[com.clerk.backend_api.models.operations.ListDomainsResponse](../../models/operations/ListDomainsResponse.md)**
+**[ListDomainsResponse](../../models/operations/ListDomainsResponse.md)**
 ### Errors
 
 | Error Object           | Status Code            | Content Type           |
@@ -81,17 +75,10 @@ If you're planning to configure the new satellite domain to run behind a proxy,
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.AddDomainRequestBody;
+import com.clerk.backend_api.models.operations.AddDomainResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -116,7 +103,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -128,16 +115,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                       | Type                                                                                                            | Required                                                                                                        | Description                                                                                                     |
-| --------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                       | [com.clerk.backend_api.models.operations.AddDomainRequestBody](../../models/operations/AddDomainRequestBody.md) | :heavy_check_mark:                                                                                              | The request object to use for the request.                                                                      |
+| Parameter                                                               | Type                                                                    | Required                                                                | Description                                                             |
+| ----------------------------------------------------------------------- | ----------------------------------------------------------------------- | ----------------------------------------------------------------------- | ----------------------------------------------------------------------- |
+| `request`                                                               | [AddDomainRequestBody](../../models/operations/AddDomainRequestBody.md) | :heavy_check_mark:                                                      | The request object to use for the request.                              |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.AddDomainResponse](../../models/operations/AddDomainResponse.md)**
+**[AddDomainResponse](../../models/operations/AddDomainResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -156,17 +145,9 @@ It is currently not possible to delete the instance's primary domain.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeleteDomainResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -186,7 +167,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -198,6 +179,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                                              | Type                                                                   | Required                                                               | Description                                                            |
@@ -207,7 +190,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeleteDomainResponse](../../models/operations/DeleteDomainResponse.md)**
+**[DeleteDomainResponse](../../models/operations/DeleteDomainResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -232,17 +215,10 @@ update the instance's home origin, affecting the default application paths.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateDomainRequestBody;
+import com.clerk.backend_api.models.operations.UpdateDomainResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -264,7 +240,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -276,17 +252,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                             | Type                                                                                                                  | Required                                                                                                              | Description                                                                                                           |
-| --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- |
-| `domainId`                                                                                                            | *String*                                                                                                              | :heavy_check_mark:                                                                                                    | The ID of the domain that will be updated.                                                                            |
-| `requestBody`                                                                                                         | [com.clerk.backend_api.models.operations.UpdateDomainRequestBody](../../models/operations/UpdateDomainRequestBody.md) | :heavy_check_mark:                                                                                                    | N/A                                                                                                                   |
+| Parameter                                                                     | Type                                                                          | Required                                                                      | Description                                                                   |
+| ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- |
+| `domainId`                                                                    | *String*                                                                      | :heavy_check_mark:                                                            | The ID of the domain that will be updated.                                    |
+| `requestBody`                                                                 | [UpdateDomainRequestBody](../../models/operations/UpdateDomainRequestBody.md) | :heavy_check_mark:                                                            | N/A                                                                           |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateDomainResponse](../../models/operations/UpdateDomainResponse.md)**
+**[UpdateDomainResponse](../../models/operations/UpdateDomainResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/emailaddresses/README.md b/docs/sdks/emailaddresses/README.md
index 10c5001..50e0d00 100644
--- a/docs/sdks/emailaddresses/README.md
+++ b/docs/sdks/emailaddresses/README.md
@@ -18,17 +18,10 @@ Create a new email address
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateEmailAddressRequestBody;
+import com.clerk.backend_api.models.operations.CreateEmailAddressResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -51,7 +44,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -63,16 +56,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                         | Type                                                                                                                              | Required                                                                                                                          | Description                                                                                                                       |
-| --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                         | [com.clerk.backend_api.models.operations.CreateEmailAddressRequestBody](../../models/operations/CreateEmailAddressRequestBody.md) | :heavy_check_mark:                                                                                                                | The request object to use for the request.                                                                                        |
+| Parameter                                                                                 | Type                                                                                      | Required                                                                                  | Description                                                                               |
+| ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- |
+| `request`                                                                                 | [CreateEmailAddressRequestBody](../../models/operations/CreateEmailAddressRequestBody.md) | :heavy_check_mark:                                                                        | The request object to use for the request.                                                |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateEmailAddressResponse](../../models/operations/CreateEmailAddressResponse.md)**
+**[CreateEmailAddressResponse](../../models/operations/CreateEmailAddressResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -90,17 +85,9 @@ Returns the details of an email address.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetEmailAddressResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -120,7 +107,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -132,6 +119,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                               | Type                                    | Required                                | Description                             |
@@ -141,7 +130,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetEmailAddressResponse](../../models/operations/GetEmailAddressResponse.md)**
+**[GetEmailAddressResponse](../../models/operations/GetEmailAddressResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -159,17 +148,9 @@ Delete the email address with the given ID
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeleteEmailAddressResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -189,7 +170,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -201,6 +182,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                             | Type                                  | Required                              | Description                           |
@@ -210,7 +193,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeleteEmailAddressResponse](../../models/operations/DeleteEmailAddressResponse.md)**
+**[DeleteEmailAddressResponse](../../models/operations/DeleteEmailAddressResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -228,17 +211,10 @@ Updates an email address.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateEmailAddressRequestBody;
+import com.clerk.backend_api.models.operations.UpdateEmailAddressResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -260,7 +236,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -272,17 +248,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                             | Type                                                                                                                                                  | Required                                                                                                                                              | Description                                                                                                                                           |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `emailAddressId`                                                                                                                                      | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The ID of the email address to update                                                                                                                 |
-| `requestBody`                                                                                                                                         | [Optional<? extends com.clerk.backend_api.models.operations.UpdateEmailAddressRequestBody>](../../models/operations/UpdateEmailAddressRequestBody.md) | :heavy_minus_sign:                                                                                                                                    | N/A                                                                                                                                                   |
+| Parameter                                                                                           | Type                                                                                                | Required                                                                                            | Description                                                                                         |
+| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
+| `emailAddressId`                                                                                    | *String*                                                                                            | :heavy_check_mark:                                                                                  | The ID of the email address to update                                                               |
+| `requestBody`                                                                                       | [Optional<UpdateEmailAddressRequestBody>](../../models/operations/UpdateEmailAddressRequestBody.md) | :heavy_minus_sign:                                                                                  | N/A                                                                                                 |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateEmailAddressResponse](../../models/operations/UpdateEmailAddressResponse.md)**
+**[UpdateEmailAddressResponse](../../models/operations/UpdateEmailAddressResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/instance/README.md b/docs/sdks/instance/README.md
index ea0984a..b0f1a59 100644
--- a/docs/sdks/instance/README.md
+++ b/docs/sdks/instance/README.md
@@ -20,17 +20,10 @@ Updates the settings of an instance
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigRequestBody;
+import com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -53,7 +46,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -65,16 +58,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                     | Type                                                                                                                                          | Required                                                                                                                                      | Description                                                                                                                                   |
-| --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                                     | [com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigRequestBody](../../models/operations/UpdateInstanceAuthConfigRequestBody.md) | :heavy_check_mark:                                                                                                                            | The request object to use for the request.                                                                                                    |
+| Parameter                                                                                             | Type                                                                                                  | Required                                                                                              | Description                                                                                           |
+| ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- |
+| `request`                                                                                             | [UpdateInstanceAuthConfigRequestBody](../../models/operations/UpdateInstanceAuthConfigRequestBody.md) | :heavy_check_mark:                                                                                    | The request object to use for the request.                                                            |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse](../../models/operations/UpdateInstanceAuthConfigResponse.md)**
+**[UpdateInstanceAuthConfigResponse](../../models/operations/UpdateInstanceAuthConfigResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -98,17 +93,10 @@ WARNING: Changing your domain will invalidate all current user sessions (i.e. us
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRequestBody;
+import com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -129,7 +117,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -141,16 +129,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                                 | Type                                                                                                                                                      | Required                                                                                                                                                  | Description                                                                                                                                               |
-| --------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                                                 | [com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRequestBody](../../models/operations/UpdateProductionInstanceDomainRequestBody.md) | :heavy_check_mark:                                                                                                                                        | The request object to use for the request.                                                                                                                |
+| Parameter                                                                                                         | Type                                                                                                              | Required                                                                                                          | Description                                                                                                       |
+| ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
+| `request`                                                                                                         | [UpdateProductionInstanceDomainRequestBody](../../models/operations/UpdateProductionInstanceDomainRequestBody.md) | :heavy_check_mark:                                                                                                | The request object to use for the request.                                                                        |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainResponse](../../models/operations/UpdateProductionInstanceDomainResponse.md)**
+**[UpdateProductionInstanceDomainResponse](../../models/operations/UpdateProductionInstanceDomainResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -168,17 +158,10 @@ Updates the settings of an instance
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateInstanceRequestBody;
+import com.clerk.backend_api.models.operations.UpdateInstanceResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -199,7 +182,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -211,16 +194,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                 | Type                                                                                                                      | Required                                                                                                                  | Description                                                                                                               |
-| ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                 | [com.clerk.backend_api.models.operations.UpdateInstanceRequestBody](../../models/operations/UpdateInstanceRequestBody.md) | :heavy_check_mark:                                                                                                        | The request object to use for the request.                                                                                |
+| Parameter                                                                         | Type                                                                              | Required                                                                          | Description                                                                       |
+| --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- |
+| `request`                                                                         | [UpdateInstanceRequestBody](../../models/operations/UpdateInstanceRequestBody.md) | :heavy_check_mark:                                                                | The request object to use for the request.                                        |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateInstanceResponse](../../models/operations/UpdateInstanceResponse.md)**
+**[UpdateInstanceResponse](../../models/operations/UpdateInstanceResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -238,17 +223,10 @@ Updates the restriction settings of an instance
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRequestBody;
+import com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -271,7 +249,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -283,16 +261,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                         | Type                                                                                                                                              | Required                                                                                                                                          | Description                                                                                                                                       |
-| ------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                                         | [com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRequestBody](../../models/operations/UpdateInstanceRestrictionsRequestBody.md) | :heavy_check_mark:                                                                                                                                | The request object to use for the request.                                                                                                        |
+| Parameter                                                                                                 | Type                                                                                                      | Required                                                                                                  | Description                                                                                               |
+| --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
+| `request`                                                                                                 | [UpdateInstanceRestrictionsRequestBody](../../models/operations/UpdateInstanceRestrictionsRequestBody.md) | :heavy_check_mark:                                                                                        | The request object to use for the request.                                                                |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsResponse](../../models/operations/UpdateInstanceRestrictionsResponse.md)**
+**[UpdateInstanceRestrictionsResponse](../../models/operations/UpdateInstanceRestrictionsResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -314,17 +294,10 @@ WARNING: Changing your domain will invalidate all current user sessions (i.e. us
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRequestBody;
+import com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -345,7 +318,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -357,16 +330,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                                 | Type                                                                                                                                                      | Required                                                                                                                                                  | Description                                                                                                                                               |
-| --------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                                                 | [com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRequestBody](../../models/operations/ChangeProductionInstanceDomainRequestBody.md) | :heavy_check_mark:                                                                                                                                        | The request object to use for the request.                                                                                                                |
+| Parameter                                                                                                         | Type                                                                                                              | Required                                                                                                          | Description                                                                                                       |
+| ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
+| `request`                                                                                                         | [ChangeProductionInstanceDomainRequestBody](../../models/operations/ChangeProductionInstanceDomainRequestBody.md) | :heavy_check_mark:                                                                                                | The request object to use for the request.                                                                        |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainResponse](../../models/operations/ChangeProductionInstanceDomainResponse.md)**
+**[ChangeProductionInstanceDomainResponse](../../models/operations/ChangeProductionInstanceDomainResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -384,17 +359,10 @@ Updates the organization settings of the instance
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsRequestBody;
+import com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -417,7 +385,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -429,16 +397,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                                         | Type                                                                                                                                                              | Required                                                                                                                                                          | Description                                                                                                                                                       |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                                                         | [com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsRequestBody](../../models/operations/UpdateInstanceOrganizationSettingsRequestBody.md) | :heavy_check_mark:                                                                                                                                                | The request object to use for the request.                                                                                                                        |
+| Parameter                                                                                                                 | Type                                                                                                                      | Required                                                                                                                  | Description                                                                                                               |
+| ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
+| `request`                                                                                                                 | [UpdateInstanceOrganizationSettingsRequestBody](../../models/operations/UpdateInstanceOrganizationSettingsRequestBody.md) | :heavy_check_mark:                                                                                                        | The request object to use for the request.                                                                                |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsResponse](../../models/operations/UpdateInstanceOrganizationSettingsResponse.md)**
+**[UpdateInstanceOrganizationSettingsResponse](../../models/operations/UpdateInstanceOrganizationSettingsResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/invitations/README.md b/docs/sdks/invitations/README.md
index 9ae2387..724c683 100644
--- a/docs/sdks/invitations/README.md
+++ b/docs/sdks/invitations/README.md
@@ -19,17 +19,10 @@ Also, trying to create an invitation for an email address that already exists in
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateInvitationRequestBody;
+import com.clerk.backend_api.models.operations.CreateInvitationResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -53,7 +46,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -65,16 +58,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                     | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
-| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                     | [com.clerk.backend_api.models.operations.CreateInvitationRequestBody](../../models/operations/CreateInvitationRequestBody.md) | :heavy_check_mark:                                                                                                            | The request object to use for the request.                                                                                    |
+| Parameter                                                                             | Type                                                                                  | Required                                                                              | Description                                                                           |
+| ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
+| `request`                                                                             | [CreateInvitationRequestBody](../../models/operations/CreateInvitationRequestBody.md) | :heavy_check_mark:                                                                    | The request object to use for the request.                                            |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateInvitationResponse](../../models/operations/CreateInvitationResponse.md)**
+**[CreateInvitationResponse](../../models/operations/CreateInvitationResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -92,17 +87,8 @@ Returns all non-revoked invitations for your application, sorted by creation dat
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.operations.QueryParamStatus;
+import java.lang.Exception;
 
 public class Application {
 
@@ -130,18 +116,20 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                                                                                                                 | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `limit`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
-| `offset`                                                                                                                                  | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
-| `status`                                                                                                                                  | [Optional<? extends com.clerk.backend_api.models.operations.QueryParamStatus>](../../models/operations/QueryParamStatus.md)               | :heavy_minus_sign:                                                                                                                        | Filter invitations based on their status                                                                                                  |
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
+| `status`                                                                                                                                  | [Optional<QueryParamStatus>](../../models/operations/QueryParamStatus.md)                                                                 | :heavy_minus_sign:                                                                                                                        | Filter invitations based on their status                                                                                                  |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.ListInvitationsResponse](../../models/operations/ListInvitationsResponse.md)**
+**[ListInvitationsResponse](../../models/operations/ListInvitationsResponse.md)**
 ### Errors
 
 | Error Object           | Status Code            | Content Type           |
@@ -161,17 +149,9 @@ Only active (i.e. non-revoked) invitations can be revoked.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.RevokeInvitationResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -191,7 +171,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -203,6 +183,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                              | Type                                   | Required                               | Description                            |
@@ -212,7 +194,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.RevokeInvitationResponse](../../models/operations/RevokeInvitationResponse.md)**
+**[RevokeInvitationResponse](../../models/operations/RevokeInvitationResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/jwks/README.md b/docs/sdks/jwks/README.md
index ba4c31a..0d70a5f 100644
--- a/docs/sdks/jwks/README.md
+++ b/docs/sdks/jwks/README.md
@@ -15,17 +15,9 @@ Retrieve the JSON Web Key Set of the instance
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetJWKSResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -39,7 +31,7 @@ public class Application {
                 .call();
 
             // handle response
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -52,9 +44,11 @@ public class Application {
 ```
 
 
+
+
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetJWKSResponse](../../models/operations/GetJWKSResponse.md)**
+**[GetJWKSResponse](../../models/operations/GetJWKSResponse.md)**
 ### Errors
 
 | Error Object           | Status Code            | Content Type           |
diff --git a/docs/sdks/jwttemplates/README.md b/docs/sdks/jwttemplates/README.md
index 498d7b4..d69a345 100644
--- a/docs/sdks/jwttemplates/README.md
+++ b/docs/sdks/jwttemplates/README.md
@@ -19,17 +19,9 @@ List all templates
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.ListJWTTemplatesResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -45,7 +37,7 @@ public class Application {
             if (res.jwtTemplateList().isPresent()) {
                 // handle response
             }
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -58,9 +50,11 @@ public class Application {
 ```
 
 
+
+
 ### Response
 
-**[com.clerk.backend_api.models.operations.ListJWTTemplatesResponse](../../models/operations/ListJWTTemplatesResponse.md)**
+**[ListJWTTemplatesResponse](../../models/operations/ListJWTTemplatesResponse.md)**
 ### Errors
 
 | Error Object           | Status Code            | Content Type           |
@@ -77,17 +71,10 @@ Create a new JWT template
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateJWTTemplateRequestBody;
+import com.clerk.backend_api.models.operations.CreateJWTTemplateResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -110,7 +97,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -122,16 +109,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                       | Type                                                                                                                            | Required                                                                                                                        | Description                                                                                                                     |
-| ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                       | [com.clerk.backend_api.models.operations.CreateJWTTemplateRequestBody](../../models/operations/CreateJWTTemplateRequestBody.md) | :heavy_check_mark:                                                                                                              | The request object to use for the request.                                                                                      |
+| Parameter                                                                               | Type                                                                                    | Required                                                                                | Description                                                                             |
+| --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
+| `request`                                                                               | [CreateJWTTemplateRequestBody](../../models/operations/CreateJWTTemplateRequestBody.md) | :heavy_check_mark:                                                                      | The request object to use for the request.                                              |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateJWTTemplateResponse](../../models/operations/CreateJWTTemplateResponse.md)**
+**[CreateJWTTemplateResponse](../../models/operations/CreateJWTTemplateResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -149,17 +138,9 @@ Retrieve the details of a given JWT template
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetJWTTemplateResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -179,7 +160,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -191,6 +172,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter          | Type               | Required           | Description        |
@@ -200,7 +183,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetJWTTemplateResponse](../../models/operations/GetJWTTemplateResponse.md)**
+**[GetJWTTemplateResponse](../../models/operations/GetJWTTemplateResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -218,17 +201,10 @@ Updates an existing JWT template
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateJWTTemplateRequestBody;
+import com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -250,7 +226,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -262,17 +238,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                           | Type                                                                                                                                                | Required                                                                                                                                            | Description                                                                                                                                         |
-| --------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `templateId`                                                                                                                                        | *String*                                                                                                                                            | :heavy_check_mark:                                                                                                                                  | The ID of the JWT template to update                                                                                                                |
-| `requestBody`                                                                                                                                       | [Optional<? extends com.clerk.backend_api.models.operations.UpdateJWTTemplateRequestBody>](../../models/operations/UpdateJWTTemplateRequestBody.md) | :heavy_minus_sign:                                                                                                                                  | N/A                                                                                                                                                 |
+| Parameter                                                                                         | Type                                                                                              | Required                                                                                          | Description                                                                                       |
+| ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
+| `templateId`                                                                                      | *String*                                                                                          | :heavy_check_mark:                                                                                | The ID of the JWT template to update                                                              |
+| `requestBody`                                                                                     | [Optional<UpdateJWTTemplateRequestBody>](../../models/operations/UpdateJWTTemplateRequestBody.md) | :heavy_minus_sign:                                                                                | N/A                                                                                               |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse](../../models/operations/UpdateJWTTemplateResponse.md)**
+**[UpdateJWTTemplateResponse](../../models/operations/UpdateJWTTemplateResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -290,17 +268,9 @@ Delete a Template
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeleteJWTTemplateResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -320,7 +290,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -332,6 +302,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter          | Type               | Required           | Description        |
@@ -341,7 +313,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeleteJWTTemplateResponse](../../models/operations/DeleteJWTTemplateResponse.md)**
+**[DeleteJWTTemplateResponse](../../models/operations/DeleteJWTTemplateResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/miscellaneous/README.md b/docs/sdks/miscellaneous/README.md
index 5d306da..0f06eca 100644
--- a/docs/sdks/miscellaneous/README.md
+++ b/docs/sdks/miscellaneous/README.md
@@ -16,17 +16,9 @@ It is used by Clerk SDKs when the user's authentication state cannot be immediat
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetPublicInterstitialResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -41,7 +33,7 @@ public class Application {
                 .call();
 
             // handle response
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -53,17 +45,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                             | Type                                  | Required                              | Description                           |
 | ------------------------------------- | ------------------------------------- | ------------------------------------- | ------------------------------------- |
-| `frontendApi`                         | *Optional<? extends String>*          | :heavy_minus_sign:                    | The Frontend API key of your instance |
-| `publishableKey`                      | *Optional<? extends String>*          | :heavy_minus_sign:                    | The publishable key of your instance  |
+| `frontendApi`                         | *Optional<String>*                    | :heavy_minus_sign:                    | The Frontend API key of your instance |
+| `publishableKey`                      | *Optional<String>*                    | :heavy_minus_sign:                    | The publishable key of your instance  |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetPublicInterstitialResponse](../../models/operations/GetPublicInterstitialResponse.md)**
+**[GetPublicInterstitialResponse](../../models/operations/GetPublicInterstitialResponse.md)**
 ### Errors
 
 | Error Object           | Status Code            | Content Type           |
diff --git a/docs/sdks/oauthapplications/README.md b/docs/sdks/oauthapplications/README.md
index fa1ff5a..a05b8a0 100644
--- a/docs/sdks/oauthapplications/README.md
+++ b/docs/sdks/oauthapplications/README.md
@@ -23,17 +23,7 @@ Most recent OAuth applications will be returned first.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import java.lang.Exception;
 
 public class Application {
 
@@ -63,17 +53,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                                                                                                                 | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `limit`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
-| `offset`                                                                                                                                  | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse](../../models/operations/ListOAuthApplicationsResponse.md)**
+**[ListOAuthApplicationsResponse](../../models/operations/ListOAuthApplicationsResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -93,17 +85,10 @@ All URL schemes are allowed such as `http://`, `https://`, `myapp://`, etc...
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateOAuthApplicationRequestBody;
+import com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -129,7 +114,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -141,16 +126,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                 | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
-| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                                 | [com.clerk.backend_api.models.operations.CreateOAuthApplicationRequestBody](../../models/operations/CreateOAuthApplicationRequestBody.md) | :heavy_check_mark:                                                                                                                        | The request object to use for the request.                                                                                                |
+| Parameter                                                                                         | Type                                                                                              | Required                                                                                          | Description                                                                                       |
+| ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
+| `request`                                                                                         | [CreateOAuthApplicationRequestBody](../../models/operations/CreateOAuthApplicationRequestBody.md) | :heavy_check_mark:                                                                                | The request object to use for the request.                                                        |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse](../../models/operations/CreateOAuthApplicationResponse.md)**
+**[CreateOAuthApplicationResponse](../../models/operations/CreateOAuthApplicationResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -168,17 +155,9 @@ Fetches the OAuth application whose ID matches the provided `id` in the path.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetOAuthApplicationResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -198,7 +177,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -210,6 +189,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                       | Type                            | Required                        | Description                     |
@@ -219,7 +200,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetOAuthApplicationResponse](../../models/operations/GetOAuthApplicationResponse.md)**
+**[GetOAuthApplicationResponse](../../models/operations/GetOAuthApplicationResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -237,17 +218,10 @@ Updates an existing OAuth application
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequestBody;
+import com.clerk.backend_api.models.operations.UpdateOAuthApplicationResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -270,7 +244,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -282,17 +256,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                 | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
-| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `oauthApplicationId`                                                                                                                      | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | The ID of the OAuth application to update                                                                                                 |
-| `requestBody`                                                                                                                             | [com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequestBody](../../models/operations/UpdateOAuthApplicationRequestBody.md) | :heavy_check_mark:                                                                                                                        | N/A                                                                                                                                       |
+| Parameter                                                                                         | Type                                                                                              | Required                                                                                          | Description                                                                                       |
+| ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
+| `oauthApplicationId`                                                                              | *String*                                                                                          | :heavy_check_mark:                                                                                | The ID of the OAuth application to update                                                         |
+| `requestBody`                                                                                     | [UpdateOAuthApplicationRequestBody](../../models/operations/UpdateOAuthApplicationRequestBody.md) | :heavy_check_mark:                                                                                | N/A                                                                                               |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateOAuthApplicationResponse](../../models/operations/UpdateOAuthApplicationResponse.md)**
+**[UpdateOAuthApplicationResponse](../../models/operations/UpdateOAuthApplicationResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -311,17 +287,9 @@ This is not reversible.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeleteOAuthApplicationResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -341,7 +309,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -353,6 +321,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                 | Type                                      | Required                                  | Description                               |
@@ -362,7 +332,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeleteOAuthApplicationResponse](../../models/operations/DeleteOAuthApplicationResponse.md)**
+**[DeleteOAuthApplicationResponse](../../models/operations/DeleteOAuthApplicationResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -381,17 +351,9 @@ When the client secret is rotated, make sure to update it in authorized OAuth cl
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -411,7 +373,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -423,6 +385,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                                             | Type                                                                  | Required                                                              | Description                                                           |
@@ -432,7 +396,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretResponse](../../models/operations/RotateOAuthApplicationSecretResponse.md)**
+**[RotateOAuthApplicationSecretResponse](../../models/operations/RotateOAuthApplicationSecretResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/organizationinvitations/README.md b/docs/sdks/organizationinvitations/README.md
index 89bd9a1..4729bc8 100644
--- a/docs/sdks/organizationinvitations/README.md
+++ b/docs/sdks/organizationinvitations/README.md
@@ -35,17 +35,10 @@ When the organization invitation is accepted, the metadata will be transferred t
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateOrganizationInvitationRequestBody;
+import com.clerk.backend_api.models.operations.CreateOrganizationInvitationResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -70,7 +63,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -82,17 +75,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                             | Type                                                                                                                                                  | Required                                                                                                                                              | Description                                                                                                                                           |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                      | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The ID of the organization for which to send the invitation                                                                                           |
-| `requestBody`                                                                                                                                         | [com.clerk.backend_api.models.operations.CreateOrganizationInvitationRequestBody](../../models/operations/CreateOrganizationInvitationRequestBody.md) | :heavy_check_mark:                                                                                                                                    | N/A                                                                                                                                                   |
+| Parameter                                                                                                     | Type                                                                                                          | Required                                                                                                      | Description                                                                                                   |
+| ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                              | *String*                                                                                                      | :heavy_check_mark:                                                                                            | The ID of the organization for which to send the invitation                                                   |
+| `requestBody`                                                                                                 | [CreateOrganizationInvitationRequestBody](../../models/operations/CreateOrganizationInvitationRequestBody.md) | :heavy_check_mark:                                                                                            | N/A                                                                                                           |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateOrganizationInvitationResponse](../../models/operations/CreateOrganizationInvitationResponse.md)**
+**[CreateOrganizationInvitationResponse](../../models/operations/CreateOrganizationInvitationResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -115,17 +110,8 @@ Any invitations created as a result of an Organization Domain are not included i
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.operations.ListOrganizationInvitationsQueryParamStatus;
+import java.lang.Exception;
 
 public class Application {
 
@@ -157,19 +143,21 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                                                         | Type                                                                                                                                                                              | Required                                                                                                                                                                          | Description                                                                                                                                                                       |
-| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                                                  | *String*                                                                                                                                                                          | :heavy_check_mark:                                                                                                                                                                | The organization ID.                                                                                                                                                              |
-| `limit`                                                                                                                                                                           | *Optional<? extends Long>*                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                                                             |
-| `offset`                                                                                                                                                                          | *Optional<? extends Long>*                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`.                                 |
-| `status`                                                                                                                                                                          | [Optional<? extends com.clerk.backend_api.models.operations.ListOrganizationInvitationsQueryParamStatus>](../../models/operations/ListOrganizationInvitationsQueryParamStatus.md) | :heavy_minus_sign:                                                                                                                                                                | Filter organization invitations based on their status                                                                                                                             |
+| Parameter                                                                                                                                 | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
+| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                                                          | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | The organization ID.                                                                                                                      |
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
+| `status`                                                                                                                                  | [Optional<ListOrganizationInvitationsQueryParamStatus>](../../models/operations/ListOrganizationInvitationsQueryParamStatus.md)           | :heavy_minus_sign:                                                                                                                        | Filter organization invitations based on their status                                                                                     |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.ListOrganizationInvitationsResponse](../../models/operations/ListOrganizationInvitationsResponse.md)**
+**[ListOrganizationInvitationsResponse](../../models/operations/ListOrganizationInvitationsResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -199,17 +187,11 @@ When the organization invitation is accepted, the metadata will be transferred t
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkResponse;
+import com.clerk.backend_api.models.operations.RequestBody;
+import java.lang.Exception;
+import java.util.List;
 
 public class Application {
 
@@ -221,7 +203,7 @@ public class Application {
 
             CreateOrganizationInvitationBulkResponse res = sdk.organizationInvitations().createBulk()
                 .organizationId("<value>")
-                .requestBody(java.util.List.of(
+                .requestBody(List.of(
                     RequestBody.builder()
                         .emailAddress("<value>")
                         .inviterUserId("<value>")
@@ -235,7 +217,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -247,17 +229,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                           | Type                                                                                                | Required                                                                                            | Description                                                                                         |
-| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                    | *String*                                                                                            | :heavy_check_mark:                                                                                  | The organization ID.                                                                                |
-| `requestBody`                                                                                       | List<[com.clerk.backend_api.models.operations.RequestBody](../../models/operations/RequestBody.md)> | :heavy_check_mark:                                                                                  | N/A                                                                                                 |
+| Parameter                                                   | Type                                                        | Required                                                    | Description                                                 |
+| ----------------------------------------------------------- | ----------------------------------------------------------- | ----------------------------------------------------------- | ----------------------------------------------------------- |
+| `organizationId`                                            | *String*                                                    | :heavy_check_mark:                                          | The organization ID.                                        |
+| `requestBody`                                               | List<[RequestBody](../../models/operations/RequestBody.md)> | :heavy_check_mark:                                          | N/A                                                         |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkResponse](../../models/operations/CreateOrganizationInvitationBulkResponse.md)**
+**[CreateOrganizationInvitationBulkResponse](../../models/operations/CreateOrganizationInvitationBulkResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -282,17 +266,7 @@ Any invitations created as a result of an Organization Domain are not included i
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import java.lang.Exception;
 
 public class Application {
 
@@ -323,18 +297,20 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                                                                                                                 | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
 | `organizationId`                                                                                                                          | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | The organization ID.                                                                                                                      |
-| `limit`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
-| `offset`                                                                                                                                  | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsResponse](../../models/operations/ListPendingOrganizationInvitationsResponse.md)**
+**[ListPendingOrganizationInvitationsResponse](../../models/operations/ListPendingOrganizationInvitationsResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -352,17 +328,9 @@ Use this request to get an existing organization invitation by ID.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetOrganizationInvitationResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -383,7 +351,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -395,6 +363,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                       | Type                            | Required                        | Description                     |
@@ -405,7 +375,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetOrganizationInvitationResponse](../../models/operations/GetOrganizationInvitationResponse.md)**
+**[GetOrganizationInvitationResponse](../../models/operations/GetOrganizationInvitationResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -427,17 +397,10 @@ Only users with "admin" role can revoke invitations.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRequestBody;
+import com.clerk.backend_api.models.operations.RevokeOrganizationInvitationResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -461,7 +424,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -473,18 +436,20 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                             | Type                                                                                                                                                  | Required                                                                                                                                              | Description                                                                                                                                           |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                      | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The organization ID.                                                                                                                                  |
-| `invitationId`                                                                                                                                        | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The organization invitation ID.                                                                                                                       |
-| `requestBody`                                                                                                                                         | [com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRequestBody](../../models/operations/RevokeOrganizationInvitationRequestBody.md) | :heavy_check_mark:                                                                                                                                    | N/A                                                                                                                                                   |
+| Parameter                                                                                                     | Type                                                                                                          | Required                                                                                                      | Description                                                                                                   |
+| ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                              | *String*                                                                                                      | :heavy_check_mark:                                                                                            | The organization ID.                                                                                          |
+| `invitationId`                                                                                                | *String*                                                                                                      | :heavy_check_mark:                                                                                            | The organization invitation ID.                                                                               |
+| `requestBody`                                                                                                 | [RevokeOrganizationInvitationRequestBody](../../models/operations/RevokeOrganizationInvitationRequestBody.md) | :heavy_check_mark:                                                                                            | N/A                                                                                                           |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.RevokeOrganizationInvitationResponse](../../models/operations/RevokeOrganizationInvitationResponse.md)**
+**[RevokeOrganizationInvitationResponse](../../models/operations/RevokeOrganizationInvitationResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/organizationmemberships/README.md b/docs/sdks/organizationmemberships/README.md
index 4dd7ac3..26d73ee 100644
--- a/docs/sdks/organizationmemberships/README.md
+++ b/docs/sdks/organizationmemberships/README.md
@@ -20,17 +20,10 @@ Only users in the same instance as the organization can be added as members.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateOrganizationMembershipRequestBody;
+import com.clerk.backend_api.models.operations.CreateOrganizationMembershipResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -54,7 +47,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -66,17 +59,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                             | Type                                                                                                                                                  | Required                                                                                                                                              | Description                                                                                                                                           |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                      | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The ID of the organization where the new membership will be created                                                                                   |
-| `requestBody`                                                                                                                                         | [com.clerk.backend_api.models.operations.CreateOrganizationMembershipRequestBody](../../models/operations/CreateOrganizationMembershipRequestBody.md) | :heavy_check_mark:                                                                                                                                    | N/A                                                                                                                                                   |
+| Parameter                                                                                                     | Type                                                                                                          | Required                                                                                                      | Description                                                                                                   |
+| ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                              | *String*                                                                                                      | :heavy_check_mark:                                                                                            | The ID of the organization where the new membership will be created                                           |
+| `requestBody`                                                                                                 | [CreateOrganizationMembershipRequestBody](../../models/operations/CreateOrganizationMembershipRequestBody.md) | :heavy_check_mark:                                                                                            | N/A                                                                                                           |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateOrganizationMembershipResponse](../../models/operations/CreateOrganizationMembershipResponse.md)**
+**[CreateOrganizationMembershipResponse](../../models/operations/CreateOrganizationMembershipResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -94,17 +89,7 @@ Retrieves all user memberships for the given organization
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import java.lang.Exception;
 
 public class Application {
 
@@ -136,19 +121,21 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                                                                                                                                                                                                           | Type                                                                                                                                                                                                                                | Required                                                                                                                                                                                                                            | Description                                                                                                                                                                                                                         |
 | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `organizationId`                                                                                                                                                                                                                    | *String*                                                                                                                                                                                                                            | :heavy_check_mark:                                                                                                                                                                                                                  | The organization ID.                                                                                                                                                                                                                |
-| `limit`                                                                                                                                                                                                                             | *Optional<? extends Long>*                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                                  | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                                                                                                               |
-| `offset`                                                                                                                                                                                                                            | *Optional<? extends Long>*                                                                                                                                                                                                          | :heavy_minus_sign:                                                                                                                                                                                                                  | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`.                                                                                   |
-| `orderBy`                                                                                                                                                                                                                           | *Optional<? extends String>*                                                                                                                                                                                                        | :heavy_minus_sign:                                                                                                                                                                                                                  | Sorts organizations memberships by phone_number, email_address, created_at, first_name, last_name or username.<br/>By prepending one of those values with + or -,<br/>we can choose to sort in ascending (ASC) or descending (DESC) order." |
+| `limit`                                                                                                                                                                                                                             | *Optional<Long>*                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                  | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                                                                                                               |
+| `offset`                                                                                                                                                                                                                            | *Optional<Long>*                                                                                                                                                                                                                    | :heavy_minus_sign:                                                                                                                                                                                                                  | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`.                                                                                   |
+| `orderBy`                                                                                                                                                                                                                           | *Optional<String>*                                                                                                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                                                                                  | Sorts organizations memberships by phone_number, email_address, created_at, first_name, last_name or username.<br/>By prepending one of those values with + or -,<br/>we can choose to sort in ascending (ASC) or descending (DESC) order." |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.ListOrganizationMembershipsResponse](../../models/operations/ListOrganizationMembershipsResponse.md)**
+**[ListOrganizationMembershipsResponse](../../models/operations/ListOrganizationMembershipsResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -166,17 +153,10 @@ Updates the properties of an existing organization membership
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRequestBody;
+import com.clerk.backend_api.models.operations.UpdateOrganizationMembershipResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -200,7 +180,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -212,18 +192,20 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                             | Type                                                                                                                                                  | Required                                                                                                                                              | Description                                                                                                                                           |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                      | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The ID of the organization the membership belongs to                                                                                                  |
-| `userId`                                                                                                                                              | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The ID of the user that this membership belongs to                                                                                                    |
-| `requestBody`                                                                                                                                         | [com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRequestBody](../../models/operations/UpdateOrganizationMembershipRequestBody.md) | :heavy_check_mark:                                                                                                                                    | N/A                                                                                                                                                   |
+| Parameter                                                                                                     | Type                                                                                                          | Required                                                                                                      | Description                                                                                                   |
+| ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                              | *String*                                                                                                      | :heavy_check_mark:                                                                                            | The ID of the organization the membership belongs to                                                          |
+| `userId`                                                                                                      | *String*                                                                                                      | :heavy_check_mark:                                                                                            | The ID of the user that this membership belongs to                                                            |
+| `requestBody`                                                                                                 | [UpdateOrganizationMembershipRequestBody](../../models/operations/UpdateOrganizationMembershipRequestBody.md) | :heavy_check_mark:                                                                                            | N/A                                                                                                           |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateOrganizationMembershipResponse](../../models/operations/UpdateOrganizationMembershipResponse.md)**
+**[UpdateOrganizationMembershipResponse](../../models/operations/UpdateOrganizationMembershipResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -241,17 +223,9 @@ Removes the given membership from the organization
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeleteOrganizationMembershipResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -272,7 +246,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -284,6 +258,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                            | Type                                                 | Required                                             | Description                                          |
@@ -294,7 +270,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeleteOrganizationMembershipResponse](../../models/operations/DeleteOrganizationMembershipResponse.md)**
+**[DeleteOrganizationMembershipResponse](../../models/operations/DeleteOrganizationMembershipResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -314,17 +290,10 @@ You can remove metadata keys at any level by setting their value to `null`.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataRequestBody;
+import com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -347,7 +316,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -359,18 +328,20 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                                             | Type                                                                                                                                                                  | Required                                                                                                                                                              | Description                                                                                                                                                           |
-| --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                                      | *String*                                                                                                                                                              | :heavy_check_mark:                                                                                                                                                    | The ID of the organization the membership belongs to                                                                                                                  |
-| `userId`                                                                                                                                                              | *String*                                                                                                                                                              | :heavy_check_mark:                                                                                                                                                    | The ID of the user that this membership belongs to                                                                                                                    |
-| `requestBody`                                                                                                                                                         | [com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataRequestBody](../../models/operations/UpdateOrganizationMembershipMetadataRequestBody.md) | :heavy_check_mark:                                                                                                                                                    | N/A                                                                                                                                                                   |
+| Parameter                                                                                                                     | Type                                                                                                                          | Required                                                                                                                      | Description                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                                              | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | The ID of the organization the membership belongs to                                                                          |
+| `userId`                                                                                                                      | *String*                                                                                                                      | :heavy_check_mark:                                                                                                            | The ID of the user that this membership belongs to                                                                            |
+| `requestBody`                                                                                                                 | [UpdateOrganizationMembershipMetadataRequestBody](../../models/operations/UpdateOrganizationMembershipMetadataRequestBody.md) | :heavy_check_mark:                                                                                                            | N/A                                                                                                                           |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataResponse](../../models/operations/UpdateOrganizationMembershipMetadataResponse.md)**
+**[UpdateOrganizationMembershipMetadataResponse](../../models/operations/UpdateOrganizationMembershipMetadataResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/organizations/README.md b/docs/sdks/organizations/README.md
index 9688dbc..9e66d96 100644
--- a/docs/sdks/organizations/README.md
+++ b/docs/sdks/organizations/README.md
@@ -25,17 +25,10 @@ Most recent organizations will be returned first.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.ListOrganizationsRequest;
+import com.clerk.backend_api.models.operations.ListOrganizationsResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -58,7 +51,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -70,16 +63,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                               | Type                                                                                                                    | Required                                                                                                                | Description                                                                                                             |
-| ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                               | [com.clerk.backend_api.models.operations.ListOrganizationsRequest](../../models/operations/ListOrganizationsRequest.md) | :heavy_check_mark:                                                                                                      | The request object to use for the request.                                                                              |
+| Parameter                                                                       | Type                                                                            | Required                                                                        | Description                                                                     |
+| ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- |
+| `request`                                                                       | [ListOrganizationsRequest](../../models/operations/ListOrganizationsRequest.md) | :heavy_check_mark:                                                              | The request object to use for the request.                                      |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.ListOrganizationsResponse](../../models/operations/ListOrganizationsResponse.md)**
+**[ListOrganizationsResponse](../../models/operations/ListOrganizationsResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -105,17 +100,10 @@ Public metadata can be accessed from the Backend API, and are read-only from the
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateOrganizationRequestBody;
+import com.clerk.backend_api.models.operations.CreateOrganizationResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -140,7 +128,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -152,16 +140,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                         | Type                                                                                                                              | Required                                                                                                                          | Description                                                                                                                       |
-| --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                         | [com.clerk.backend_api.models.operations.CreateOrganizationRequestBody](../../models/operations/CreateOrganizationRequestBody.md) | :heavy_check_mark:                                                                                                                | The request object to use for the request.                                                                                        |
+| Parameter                                                                                 | Type                                                                                      | Required                                                                                  | Description                                                                               |
+| ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- |
+| `request`                                                                                 | [CreateOrganizationRequestBody](../../models/operations/CreateOrganizationRequestBody.md) | :heavy_check_mark:                                                                        | The request object to use for the request.                                                |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateOrganizationResponse](../../models/operations/CreateOrganizationResponse.md)**
+**[CreateOrganizationResponse](../../models/operations/CreateOrganizationResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -179,17 +169,9 @@ Fetches the organization whose ID or slug matches the provided `id_or_slug` URL
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetOrganizationResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -209,7 +191,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -221,6 +203,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                          | Type                               | Required                           | Description                        |
@@ -230,7 +214,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetOrganizationResponse](../../models/operations/GetOrganizationResponse.md)**
+**[GetOrganizationResponse](../../models/operations/GetOrganizationResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -248,17 +232,10 @@ Updates an existing organization
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateOrganizationRequestBody;
+import com.clerk.backend_api.models.operations.UpdateOrganizationResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -280,7 +257,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -292,17 +269,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                         | Type                                                                                                                              | Required                                                                                                                          | Description                                                                                                                       |
-| --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                  | *String*                                                                                                                          | :heavy_check_mark:                                                                                                                | The ID of the organization to update                                                                                              |
-| `requestBody`                                                                                                                     | [com.clerk.backend_api.models.operations.UpdateOrganizationRequestBody](../../models/operations/UpdateOrganizationRequestBody.md) | :heavy_check_mark:                                                                                                                | N/A                                                                                                                               |
+| Parameter                                                                                 | Type                                                                                      | Required                                                                                  | Description                                                                               |
+| ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- |
+| `organizationId`                                                                          | *String*                                                                                  | :heavy_check_mark:                                                                        | The ID of the organization to update                                                      |
+| `requestBody`                                                                             | [UpdateOrganizationRequestBody](../../models/operations/UpdateOrganizationRequestBody.md) | :heavy_check_mark:                                                                        | N/A                                                                                       |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateOrganizationResponse](../../models/operations/UpdateOrganizationResponse.md)**
+**[UpdateOrganizationResponse](../../models/operations/UpdateOrganizationResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -322,17 +301,9 @@ This is not reversible.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeleteOrganizationResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -352,7 +323,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -364,6 +335,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                            | Type                                 | Required                             | Description                          |
@@ -373,7 +346,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeleteOrganizationResponse](../../models/operations/DeleteOrganizationResponse.md)**
+**[DeleteOrganizationResponse](../../models/operations/DeleteOrganizationResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -394,17 +367,10 @@ You can remove metadata keys at any level by setting their value to `null`.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequestBody;
+import com.clerk.backend_api.models.operations.MergeOrganizationMetadataResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -426,7 +392,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -438,17 +404,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                       | Type                                                                                                                                            | Required                                                                                                                                        | Description                                                                                                                                     |
-| ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                | *String*                                                                                                                                        | :heavy_check_mark:                                                                                                                              | The ID of the organization for which metadata will be merged or updated                                                                         |
-| `requestBody`                                                                                                                                   | [com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequestBody](../../models/operations/MergeOrganizationMetadataRequestBody.md) | :heavy_check_mark:                                                                                                                              | N/A                                                                                                                                             |
+| Parameter                                                                                               | Type                                                                                                    | Required                                                                                                | Description                                                                                             |
+| ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                        | *String*                                                                                                | :heavy_check_mark:                                                                                      | The ID of the organization for which metadata will be merged or updated                                 |
+| `requestBody`                                                                                           | [MergeOrganizationMetadataRequestBody](../../models/operations/MergeOrganizationMetadataRequestBody.md) | :heavy_check_mark:                                                                                      | N/A                                                                                                     |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.MergeOrganizationMetadataResponse](../../models/operations/MergeOrganizationMetadataResponse.md)**
+**[MergeOrganizationMetadataResponse](../../models/operations/MergeOrganizationMetadataResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -469,17 +437,11 @@ Only the following file content types are supported: `image/jpeg`, `image/png`,
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UploadOrganizationLogoFile;
+import com.clerk.backend_api.models.operations.UploadOrganizationLogoRequestBody;
+import com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -506,7 +468,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -518,17 +480,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                                     | Type                                                                                                                                                          | Required                                                                                                                                                      | Description                                                                                                                                                   |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `organizationId`                                                                                                                                              | *String*                                                                                                                                                      | :heavy_check_mark:                                                                                                                                            | The ID of the organization for which to upload a logo                                                                                                         |
-| `requestBody`                                                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.operations.UploadOrganizationLogoRequestBody>](../../models/operations/UploadOrganizationLogoRequestBody.md) | :heavy_minus_sign:                                                                                                                                            | N/A                                                                                                                                                           |
+| Parameter                                                                                                   | Type                                                                                                        | Required                                                                                                    | Description                                                                                                 |
+| ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
+| `organizationId`                                                                                            | *String*                                                                                                    | :heavy_check_mark:                                                                                          | The ID of the organization for which to upload a logo                                                       |
+| `requestBody`                                                                                               | [Optional<UploadOrganizationLogoRequestBody>](../../models/operations/UploadOrganizationLogoRequestBody.md) | :heavy_minus_sign:                                                                                          | N/A                                                                                                         |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse](../../models/operations/UploadOrganizationLogoResponse.md)**
+**[UploadOrganizationLogoResponse](../../models/operations/UploadOrganizationLogoResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -546,17 +510,9 @@ Delete the organization's logo.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeleteOrganizationLogoResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -576,7 +532,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -588,6 +544,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                                      | Type                                                           | Required                                                       | Description                                                    |
@@ -597,7 +555,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeleteOrganizationLogoResponse](../../models/operations/DeleteOrganizationLogoResponse.md)**
+**[DeleteOrganizationLogoResponse](../../models/operations/DeleteOrganizationLogoResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/phonenumbers/README.md b/docs/sdks/phonenumbers/README.md
index e1adbb9..40f9671 100644
--- a/docs/sdks/phonenumbers/README.md
+++ b/docs/sdks/phonenumbers/README.md
@@ -18,17 +18,10 @@ Create a new phone number
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreatePhoneNumberRequestBody;
+import com.clerk.backend_api.models.operations.CreatePhoneNumberResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -51,7 +44,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -63,16 +56,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                       | Type                                                                                                                            | Required                                                                                                                        | Description                                                                                                                     |
-| ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                       | [com.clerk.backend_api.models.operations.CreatePhoneNumberRequestBody](../../models/operations/CreatePhoneNumberRequestBody.md) | :heavy_check_mark:                                                                                                              | The request object to use for the request.                                                                                      |
+| Parameter                                                                               | Type                                                                                    | Required                                                                                | Description                                                                             |
+| --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
+| `request`                                                                               | [CreatePhoneNumberRequestBody](../../models/operations/CreatePhoneNumberRequestBody.md) | :heavy_check_mark:                                                                      | The request object to use for the request.                                              |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreatePhoneNumberResponse](../../models/operations/CreatePhoneNumberResponse.md)**
+**[CreatePhoneNumberResponse](../../models/operations/CreatePhoneNumberResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -90,17 +85,9 @@ Returns the details of a phone number
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetPhoneNumberResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -120,7 +107,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -132,6 +119,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                              | Type                                   | Required                               | Description                            |
@@ -141,7 +130,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetPhoneNumberResponse](../../models/operations/GetPhoneNumberResponse.md)**
+**[GetPhoneNumberResponse](../../models/operations/GetPhoneNumberResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -159,17 +148,9 @@ Delete the phone number with the given ID
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeletePhoneNumberResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -189,7 +170,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -201,6 +182,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                            | Type                                 | Required                             | Description                          |
@@ -210,7 +193,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeletePhoneNumberResponse](../../models/operations/DeletePhoneNumberResponse.md)**
+**[DeletePhoneNumberResponse](../../models/operations/DeletePhoneNumberResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -228,17 +211,10 @@ Updates a phone number
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdatePhoneNumberRequestBody;
+import com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -260,7 +236,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -272,17 +248,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                           | Type                                                                                                                                                | Required                                                                                                                                            | Description                                                                                                                                         |
-| --------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `phoneNumberId`                                                                                                                                     | *String*                                                                                                                                            | :heavy_check_mark:                                                                                                                                  | The ID of the phone number to update                                                                                                                |
-| `requestBody`                                                                                                                                       | [Optional<? extends com.clerk.backend_api.models.operations.UpdatePhoneNumberRequestBody>](../../models/operations/UpdatePhoneNumberRequestBody.md) | :heavy_minus_sign:                                                                                                                                  | N/A                                                                                                                                                 |
+| Parameter                                                                                         | Type                                                                                              | Required                                                                                          | Description                                                                                       |
+| ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
+| `phoneNumberId`                                                                                   | *String*                                                                                          | :heavy_check_mark:                                                                                | The ID of the phone number to update                                                              |
+| `requestBody`                                                                                     | [Optional<UpdatePhoneNumberRequestBody>](../../models/operations/UpdatePhoneNumberRequestBody.md) | :heavy_minus_sign:                                                                                | N/A                                                                                               |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse](../../models/operations/UpdatePhoneNumberResponse.md)**
+**[UpdatePhoneNumberResponse](../../models/operations/UpdatePhoneNumberResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/proxy/README.md b/docs/sdks/proxy/README.md
index 2603e40..e20ce2b 100644
--- a/docs/sdks/proxy/README.md
+++ b/docs/sdks/proxy/README.md
@@ -22,17 +22,10 @@ a different proxy URL than the one provided. It can also be used to re-validate
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.VerifyDomainProxyRequestBody;
+import com.clerk.backend_api.models.operations.VerifyDomainProxyResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -55,7 +48,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -67,16 +60,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                       | Type                                                                                                                            | Required                                                                                                                        | Description                                                                                                                     |
-| ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                       | [com.clerk.backend_api.models.operations.VerifyDomainProxyRequestBody](../../models/operations/VerifyDomainProxyRequestBody.md) | :heavy_check_mark:                                                                                                              | The request object to use for the request.                                                                                      |
+| Parameter                                                                               | Type                                                                                    | Required                                                                                | Description                                                                             |
+| --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
+| `request`                                                                               | [VerifyDomainProxyRequestBody](../../models/operations/VerifyDomainProxyRequestBody.md) | :heavy_check_mark:                                                                      | The request object to use for the request.                                              |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.VerifyDomainProxyResponse](../../models/operations/VerifyDomainProxyResponse.md)**
+**[VerifyDomainProxyResponse](../../models/operations/VerifyDomainProxyResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/redirecturls/README.md b/docs/sdks/redirecturls/README.md
index 3b76f6e..875a2ab 100644
--- a/docs/sdks/redirecturls/README.md
+++ b/docs/sdks/redirecturls/README.md
@@ -18,17 +18,9 @@ Lists all whitelisted redirect_urls for the instance
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.ListRedirectURLsResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -44,7 +36,7 @@ public class Application {
             if (res.redirectURLList().isPresent()) {
                 // handle response
             }
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -57,9 +49,11 @@ public class Application {
 ```
 
 
+
+
 ### Response
 
-**[com.clerk.backend_api.models.operations.ListRedirectURLsResponse](../../models/operations/ListRedirectURLsResponse.md)**
+**[ListRedirectURLsResponse](../../models/operations/ListRedirectURLsResponse.md)**
 ### Errors
 
 | Error Object           | Status Code            | Content Type           |
@@ -76,17 +70,10 @@ Create a redirect URL
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateRedirectURLRequestBody;
+import com.clerk.backend_api.models.operations.CreateRedirectURLResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -109,7 +96,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -121,16 +108,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                       | Type                                                                                                                            | Required                                                                                                                        | Description                                                                                                                     |
-| ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                       | [com.clerk.backend_api.models.operations.CreateRedirectURLRequestBody](../../models/operations/CreateRedirectURLRequestBody.md) | :heavy_check_mark:                                                                                                              | The request object to use for the request.                                                                                      |
+| Parameter                                                                               | Type                                                                                    | Required                                                                                | Description                                                                             |
+| --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
+| `request`                                                                               | [CreateRedirectURLRequestBody](../../models/operations/CreateRedirectURLRequestBody.md) | :heavy_check_mark:                                                                      | The request object to use for the request.                                              |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateRedirectURLResponse](../../models/operations/CreateRedirectURLResponse.md)**
+**[CreateRedirectURLResponse](../../models/operations/CreateRedirectURLResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -148,17 +137,9 @@ Retrieve the details of the redirect URL with the given ID
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetRedirectURLResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -178,7 +159,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -190,6 +171,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                  | Type                       | Required                   | Description                |
@@ -199,7 +182,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetRedirectURLResponse](../../models/operations/GetRedirectURLResponse.md)**
+**[GetRedirectURLResponse](../../models/operations/GetRedirectURLResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -217,17 +200,9 @@ Remove the selected redirect URL from the whitelist of the instance
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeleteRedirectURLResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -247,7 +222,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -259,6 +234,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                  | Type                       | Required                   | Description                |
@@ -268,7 +245,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeleteRedirectURLResponse](../../models/operations/DeleteRedirectURLResponse.md)**
+**[DeleteRedirectURLResponse](../../models/operations/DeleteRedirectURLResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/samlconnections/README.md b/docs/sdks/samlconnections/README.md
index 64c9850..b0423c4 100644
--- a/docs/sdks/samlconnections/README.md
+++ b/docs/sdks/samlconnections/README.md
@@ -21,17 +21,7 @@ The SAML Connections are ordered by descending creation date and the most recent
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import java.lang.Exception;
 
 public class Application {
 
@@ -61,17 +51,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                                                                                                                 | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `limit`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
-| `offset`                                                                                                                                  | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse](../../models/operations/ListSAMLConnectionsResponse.md)**
+**[ListSAMLConnectionsResponse](../../models/operations/ListSAMLConnectionsResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -89,17 +81,11 @@ Create a new SAML Connection.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateSAMLConnectionRequestBody;
+import com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse;
+import com.clerk.backend_api.models.operations.Provider;
+import java.lang.Exception;
 
 public class Application {
 
@@ -125,7 +111,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -137,16 +123,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                             | Type                                                                                                                                  | Required                                                                                                                              | Description                                                                                                                           |
-| ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                             | [com.clerk.backend_api.models.operations.CreateSAMLConnectionRequestBody](../../models/operations/CreateSAMLConnectionRequestBody.md) | :heavy_check_mark:                                                                                                                    | The request object to use for the request.                                                                                            |
+| Parameter                                                                                     | Type                                                                                          | Required                                                                                      | Description                                                                                   |
+| --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- |
+| `request`                                                                                     | [CreateSAMLConnectionRequestBody](../../models/operations/CreateSAMLConnectionRequestBody.md) | :heavy_check_mark:                                                                            | The request object to use for the request.                                                    |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse](../../models/operations/CreateSAMLConnectionResponse.md)**
+**[CreateSAMLConnectionResponse](../../models/operations/CreateSAMLConnectionResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -164,17 +152,9 @@ Fetches the SAML Connection whose ID matches the provided `saml_connection_id` i
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetSAMLConnectionResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -194,7 +174,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -206,6 +186,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                     | Type                          | Required                      | Description                   |
@@ -215,7 +197,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetSAMLConnectionResponse](../../models/operations/GetSAMLConnectionResponse.md)**
+**[GetSAMLConnectionResponse](../../models/operations/GetSAMLConnectionResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -233,17 +215,10 @@ Updates the SAML Connection whose ID matches the provided `id` in the path.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequestBody;
+import com.clerk.backend_api.models.operations.UpdateSAMLConnectionResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -265,7 +240,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -277,17 +252,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                             | Type                                                                                                                                  | Required                                                                                                                              | Description                                                                                                                           |
-| ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
-| `samlConnectionId`                                                                                                                    | *String*                                                                                                                              | :heavy_check_mark:                                                                                                                    | The ID of the SAML Connection to update                                                                                               |
-| `requestBody`                                                                                                                         | [com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequestBody](../../models/operations/UpdateSAMLConnectionRequestBody.md) | :heavy_check_mark:                                                                                                                    | N/A                                                                                                                                   |
+| Parameter                                                                                     | Type                                                                                          | Required                                                                                      | Description                                                                                   |
+| --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- |
+| `samlConnectionId`                                                                            | *String*                                                                                      | :heavy_check_mark:                                                                            | The ID of the SAML Connection to update                                                       |
+| `requestBody`                                                                                 | [UpdateSAMLConnectionRequestBody](../../models/operations/UpdateSAMLConnectionRequestBody.md) | :heavy_check_mark:                                                                            | N/A                                                                                           |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateSAMLConnectionResponse](../../models/operations/UpdateSAMLConnectionResponse.md)**
+**[UpdateSAMLConnectionResponse](../../models/operations/UpdateSAMLConnectionResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -305,17 +282,9 @@ Deletes the SAML Connection whose ID matches the provided `id` in the path.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeleteSAMLConnectionResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -335,7 +304,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -347,6 +316,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                               | Type                                    | Required                                | Description                             |
@@ -356,7 +327,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeleteSAMLConnectionResponse](../../models/operations/DeleteSAMLConnectionResponse.md)**
+**[DeleteSAMLConnectionResponse](../../models/operations/DeleteSAMLConnectionResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/sessions/README.md b/docs/sdks/sessions/README.md
index 4a2dfe1..8653a2d 100644
--- a/docs/sdks/sessions/README.md
+++ b/docs/sdks/sessions/README.md
@@ -22,17 +22,10 @@ moving forward at least one of `client_id` or `user_id` parameters should be pro
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetSessionListRequest;
+import com.clerk.backend_api.models.operations.GetSessionListResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -55,7 +48,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -67,16 +60,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                         | Type                                                                                                              | Required                                                                                                          | Description                                                                                                       |
-| ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                         | [com.clerk.backend_api.models.operations.GetSessionListRequest](../../models/operations/GetSessionListRequest.md) | :heavy_check_mark:                                                                                                | The request object to use for the request.                                                                        |
+| Parameter                                                                 | Type                                                                      | Required                                                                  | Description                                                               |
+| ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- |
+| `request`                                                                 | [GetSessionListRequest](../../models/operations/GetSessionListRequest.md) | :heavy_check_mark:                                                        | The request object to use for the request.                                |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetSessionListResponse](../../models/operations/GetSessionListResponse.md)**
+**[GetSessionListResponse](../../models/operations/GetSessionListResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -94,17 +89,9 @@ Retrieve the details of a session
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetSessionResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -124,7 +111,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -136,6 +123,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter             | Type                  | Required              | Description           |
@@ -145,7 +134,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetSessionResponse](../../models/operations/GetSessionResponse.md)**
+**[GetSessionResponse](../../models/operations/GetSessionResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -164,17 +153,9 @@ In multi-session mode, a revoked session will still be returned along with its c
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.RevokeSessionResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -194,7 +175,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -206,6 +187,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter             | Type                  | Required              | Description           |
@@ -215,7 +198,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.RevokeSessionResponse](../../models/operations/RevokeSessionResponse.md)**
+**[RevokeSessionResponse](../../models/operations/RevokeSessionResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -238,17 +221,10 @@ WARNING: This endpoint is deprecated and will be removed in future versions. We
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.VerifySessionRequestBody;
+import com.clerk.backend_api.models.operations.VerifySessionResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -270,7 +246,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -282,17 +258,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                   | Type                                                                                                                                        | Required                                                                                                                                    | Description                                                                                                                                 |
-| ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
-| `sessionId`                                                                                                                                 | *String*                                                                                                                                    | :heavy_check_mark:                                                                                                                          | The ID of the session                                                                                                                       |
-| `requestBody`                                                                                                                               | [Optional<? extends com.clerk.backend_api.models.operations.VerifySessionRequestBody>](../../models/operations/VerifySessionRequestBody.md) | :heavy_minus_sign:                                                                                                                          | Parameters.                                                                                                                                 |
+| Parameter                                                                                 | Type                                                                                      | Required                                                                                  | Description                                                                               |
+| ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- |
+| `sessionId`                                                                               | *String*                                                                                  | :heavy_check_mark:                                                                        | The ID of the session                                                                     |
+| `requestBody`                                                                             | [Optional<VerifySessionRequestBody>](../../models/operations/VerifySessionRequestBody.md) | :heavy_minus_sign:                                                                        | Parameters.                                                                               |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.VerifySessionResponse](../../models/operations/VerifySessionResponse.md)**
+**[VerifySessionResponse](../../models/operations/VerifySessionResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -310,17 +288,9 @@ Creates a JSON Web Token(JWT) based on a session and a JWT Template name defined
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -341,7 +311,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -353,6 +323,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                                                     | Type                                                                          | Required                                                                      | Description                                                                   |
@@ -363,7 +335,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateResponse](../../models/operations/CreateSessionTokenFromTemplateResponse.md)**
+**[CreateSessionTokenFromTemplateResponse](../../models/operations/CreateSessionTokenFromTemplateResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/signintokens/README.md b/docs/sdks/signintokens/README.md
index 9738eb6..429b612 100644
--- a/docs/sdks/signintokens/README.md
+++ b/docs/sdks/signintokens/README.md
@@ -18,17 +18,10 @@ You can optionally supply a different duration in seconds using the `expires_in_
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateSignInTokenRequestBody;
+import com.clerk.backend_api.models.operations.CreateSignInTokenResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -51,7 +44,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -63,16 +56,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                       | Type                                                                                                                            | Required                                                                                                                        | Description                                                                                                                     |
-| ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                                       | [com.clerk.backend_api.models.operations.CreateSignInTokenRequestBody](../../models/operations/CreateSignInTokenRequestBody.md) | :heavy_check_mark:                                                                                                              | The request object to use for the request.                                                                                      |
+| Parameter                                                                               | Type                                                                                    | Required                                                                                | Description                                                                             |
+| --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
+| `request`                                                                               | [CreateSignInTokenRequestBody](../../models/operations/CreateSignInTokenRequestBody.md) | :heavy_check_mark:                                                                      | The request object to use for the request.                                              |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateSignInTokenResponse](../../models/operations/CreateSignInTokenResponse.md)**
+**[CreateSignInTokenResponse](../../models/operations/CreateSignInTokenResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -90,17 +85,9 @@ Revokes a pending sign-in token
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.RevokeSignInTokenResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -120,7 +107,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -132,6 +119,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                 | Type                                      | Required                                  | Description                               |
@@ -141,7 +130,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.RevokeSignInTokenResponse](../../models/operations/RevokeSignInTokenResponse.md)**
+**[RevokeSignInTokenResponse](../../models/operations/RevokeSignInTokenResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/signups/README.md b/docs/sdks/signups/README.md
index e75bbbb..7ff04aa 100644
--- a/docs/sdks/signups/README.md
+++ b/docs/sdks/signups/README.md
@@ -15,17 +15,10 @@ Update the sign-up with the given ID
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateSignUpRequestBody;
+import com.clerk.backend_api.models.operations.UpdateSignUpResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -47,7 +40,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -59,17 +52,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                 | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
-| ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `id`                                                                                                                                      | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | The ID of the sign-up to update                                                                                                           |
-| `requestBody`                                                                                                                             | [Optional<? extends com.clerk.backend_api.models.operations.UpdateSignUpRequestBody>](../../models/operations/UpdateSignUpRequestBody.md) | :heavy_minus_sign:                                                                                                                        | N/A                                                                                                                                       |
+| Parameter                                                                               | Type                                                                                    | Required                                                                                | Description                                                                             |
+| --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
+| `id`                                                                                    | *String*                                                                                | :heavy_check_mark:                                                                      | The ID of the sign-up to update                                                         |
+| `requestBody`                                                                           | [Optional<UpdateSignUpRequestBody>](../../models/operations/UpdateSignUpRequestBody.md) | :heavy_minus_sign:                                                                      | N/A                                                                                     |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateSignUpResponse](../../models/operations/UpdateSignUpResponse.md)**
+**[UpdateSignUpResponse](../../models/operations/UpdateSignUpResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/templates/README.md b/docs/sdks/templates/README.md
index e00ff89..c387c47 100644
--- a/docs/sdks/templates/README.md
+++ b/docs/sdks/templates/README.md
@@ -21,17 +21,10 @@ The templates are returned sorted by position.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetTemplateListResponse;
+import com.clerk.backend_api.models.operations.TemplateType;
+import java.lang.Exception;
 
 public class Application {
 
@@ -51,7 +44,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -63,16 +56,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                       | Type                                                                                            | Required                                                                                        | Description                                                                                     |
-| ----------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- |
-| `templateType`                                                                                  | [com.clerk.backend_api.models.operations.TemplateType](../../models/operations/TemplateType.md) | :heavy_check_mark:                                                                              | The type of templates to list (email or SMS)                                                    |
+| Parameter                                               | Type                                                    | Required                                                | Description                                             |
+| ------------------------------------------------------- | ------------------------------------------------------- | ------------------------------------------------------- | ------------------------------------------------------- |
+| `templateType`                                          | [TemplateType](../../models/operations/TemplateType.md) | :heavy_check_mark:                                      | The type of templates to list (email or SMS)            |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetTemplateListResponse](../../models/operations/GetTemplateListResponse.md)**
+**[GetTemplateListResponse](../../models/operations/GetTemplateListResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -90,17 +85,10 @@ Returns the details of a template
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetTemplateResponse;
+import com.clerk.backend_api.models.operations.PathParamTemplateType;
+import java.lang.Exception;
 
 public class Application {
 
@@ -121,7 +109,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -133,17 +121,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                         | Type                                                                                                              | Required                                                                                                          | Description                                                                                                       |
-| ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
-| `templateType`                                                                                                    | [com.clerk.backend_api.models.operations.PathParamTemplateType](../../models/operations/PathParamTemplateType.md) | :heavy_check_mark:                                                                                                | The type of templates to retrieve (email or SMS)                                                                  |
-| `slug`                                                                                                            | *String*                                                                                                          | :heavy_check_mark:                                                                                                | The slug (i.e. machine-friendly name) of the template to retrieve                                                 |
+| Parameter                                                                 | Type                                                                      | Required                                                                  | Description                                                               |
+| ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- |
+| `templateType`                                                            | [PathParamTemplateType](../../models/operations/PathParamTemplateType.md) | :heavy_check_mark:                                                        | The type of templates to retrieve (email or SMS)                          |
+| `slug`                                                                    | *String*                                                                  | :heavy_check_mark:                                                        | The slug (i.e. machine-friendly name) of the template to retrieve         |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetTemplateResponse](../../models/operations/GetTemplateResponse.md)**
+**[GetTemplateResponse](../../models/operations/GetTemplateResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -161,17 +151,11 @@ Updates the existing template of the given type and slug
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpsertTemplatePathParamTemplateType;
+import com.clerk.backend_api.models.operations.UpsertTemplateRequestBody;
+import com.clerk.backend_api.models.operations.UpsertTemplateResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -194,7 +178,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -206,18 +190,20 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                     | Type                                                                                                                                          | Required                                                                                                                                      | Description                                                                                                                                   |
-| --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| `templateType`                                                                                                                                | [com.clerk.backend_api.models.operations.UpsertTemplatePathParamTemplateType](../../models/operations/UpsertTemplatePathParamTemplateType.md) | :heavy_check_mark:                                                                                                                            | The type of template to update                                                                                                                |
-| `slug`                                                                                                                                        | *String*                                                                                                                                      | :heavy_check_mark:                                                                                                                            | The slug of the template to update                                                                                                            |
-| `requestBody`                                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.operations.UpsertTemplateRequestBody>](../../models/operations/UpsertTemplateRequestBody.md) | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
+| Parameter                                                                                             | Type                                                                                                  | Required                                                                                              | Description                                                                                           |
+| ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- |
+| `templateType`                                                                                        | [UpsertTemplatePathParamTemplateType](../../models/operations/UpsertTemplatePathParamTemplateType.md) | :heavy_check_mark:                                                                                    | The type of template to update                                                                        |
+| `slug`                                                                                                | *String*                                                                                              | :heavy_check_mark:                                                                                    | The slug of the template to update                                                                    |
+| `requestBody`                                                                                         | [Optional<UpsertTemplateRequestBody>](../../models/operations/UpsertTemplateRequestBody.md)           | :heavy_minus_sign:                                                                                    | N/A                                                                                                   |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpsertTemplateResponse](../../models/operations/UpsertTemplateResponse.md)**
+**[UpsertTemplateResponse](../../models/operations/UpsertTemplateResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -235,17 +221,10 @@ Reverts an updated template to its default state
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.RevertTemplatePathParamTemplateType;
+import com.clerk.backend_api.models.operations.RevertTemplateResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -266,7 +245,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -278,17 +257,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                     | Type                                                                                                                                          | Required                                                                                                                                      | Description                                                                                                                                   |
-| --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| `templateType`                                                                                                                                | [com.clerk.backend_api.models.operations.RevertTemplatePathParamTemplateType](../../models/operations/RevertTemplatePathParamTemplateType.md) | :heavy_check_mark:                                                                                                                            | The type of template to revert                                                                                                                |
-| `slug`                                                                                                                                        | *String*                                                                                                                                      | :heavy_check_mark:                                                                                                                            | The slug of the template to revert                                                                                                            |
+| Parameter                                                                                             | Type                                                                                                  | Required                                                                                              | Description                                                                                           |
+| ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- |
+| `templateType`                                                                                        | [RevertTemplatePathParamTemplateType](../../models/operations/RevertTemplatePathParamTemplateType.md) | :heavy_check_mark:                                                                                    | The type of template to revert                                                                        |
+| `slug`                                                                                                | *String*                                                                                              | :heavy_check_mark:                                                                                    | The slug of the template to revert                                                                    |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.RevertTemplateResponse](../../models/operations/RevertTemplateResponse.md)**
+**[RevertTemplateResponse](../../models/operations/RevertTemplateResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -306,17 +287,10 @@ Returns a preview of a template for a given template_type, slug and body
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.PreviewTemplateRequestBody;
+import com.clerk.backend_api.models.operations.PreviewTemplateResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -339,7 +313,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -351,18 +325,20 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                       | Type                                                                                                                                            | Required                                                                                                                                        | Description                                                                                                                                     |
-| ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
-| `templateType`                                                                                                                                  | *String*                                                                                                                                        | :heavy_check_mark:                                                                                                                              | The type of template to preview                                                                                                                 |
-| `slug`                                                                                                                                          | *String*                                                                                                                                        | :heavy_check_mark:                                                                                                                              | The slug of the template to preview                                                                                                             |
-| `requestBody`                                                                                                                                   | [Optional<? extends com.clerk.backend_api.models.operations.PreviewTemplateRequestBody>](../../models/operations/PreviewTemplateRequestBody.md) | :heavy_minus_sign:                                                                                                                              | Required parameters                                                                                                                             |
+| Parameter                                                                                     | Type                                                                                          | Required                                                                                      | Description                                                                                   |
+| --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- |
+| `templateType`                                                                                | *String*                                                                                      | :heavy_check_mark:                                                                            | The type of template to preview                                                               |
+| `slug`                                                                                        | *String*                                                                                      | :heavy_check_mark:                                                                            | The slug of the template to preview                                                           |
+| `requestBody`                                                                                 | [Optional<PreviewTemplateRequestBody>](../../models/operations/PreviewTemplateRequestBody.md) | :heavy_minus_sign:                                                                            | Required parameters                                                                           |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.PreviewTemplateResponse](../../models/operations/PreviewTemplateResponse.md)**
+**[PreviewTemplateResponse](../../models/operations/PreviewTemplateResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -382,17 +358,11 @@ The app developer will need to listen to the `email.created` or `sms.created` we
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.ToggleTemplateDeliveryPathParamTemplateType;
+import com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequestBody;
+import com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -415,7 +385,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -427,18 +397,20 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                                     | Type                                                                                                                                                          | Required                                                                                                                                                      | Description                                                                                                                                                   |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `templateType`                                                                                                                                                | [com.clerk.backend_api.models.operations.ToggleTemplateDeliveryPathParamTemplateType](../../models/operations/ToggleTemplateDeliveryPathParamTemplateType.md) | :heavy_check_mark:                                                                                                                                            | The type of template to toggle delivery for                                                                                                                   |
-| `slug`                                                                                                                                                        | *String*                                                                                                                                                      | :heavy_check_mark:                                                                                                                                            | The slug of the template for which to toggle delivery                                                                                                         |
-| `requestBody`                                                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequestBody>](../../models/operations/ToggleTemplateDeliveryRequestBody.md) | :heavy_minus_sign:                                                                                                                                            | N/A                                                                                                                                                           |
+| Parameter                                                                                                             | Type                                                                                                                  | Required                                                                                                              | Description                                                                                                           |
+| --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- |
+| `templateType`                                                                                                        | [ToggleTemplateDeliveryPathParamTemplateType](../../models/operations/ToggleTemplateDeliveryPathParamTemplateType.md) | :heavy_check_mark:                                                                                                    | The type of template to toggle delivery for                                                                           |
+| `slug`                                                                                                                | *String*                                                                                                              | :heavy_check_mark:                                                                                                    | The slug of the template for which to toggle delivery                                                                 |
+| `requestBody`                                                                                                         | [Optional<ToggleTemplateDeliveryRequestBody>](../../models/operations/ToggleTemplateDeliveryRequestBody.md)           | :heavy_minus_sign:                                                                                                    | N/A                                                                                                                   |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse](../../models/operations/ToggleTemplateDeliveryResponse.md)**
+**[ToggleTemplateDeliveryResponse](../../models/operations/ToggleTemplateDeliveryResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/testingtokens/README.md b/docs/sdks/testingtokens/README.md
index e954088..9892d87 100644
--- a/docs/sdks/testingtokens/README.md
+++ b/docs/sdks/testingtokens/README.md
@@ -15,17 +15,9 @@ Retrieve a new testing token. Only available for development instances.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateTestingTokenResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -41,7 +33,7 @@ public class Application {
             if (res.testingToken().isPresent()) {
                 // handle response
             }
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -54,9 +46,11 @@ public class Application {
 ```
 
 
+
+
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateTestingTokenResponse](../../models/operations/CreateTestingTokenResponse.md)**
+**[CreateTestingTokenResponse](../../models/operations/CreateTestingTokenResponse.md)**
 ### Errors
 
 | Error Object           | Status Code            | Content Type           |
diff --git a/docs/sdks/users/README.md b/docs/sdks/users/README.md
index 4837e67..a6fe7ce 100644
--- a/docs/sdks/users/README.md
+++ b/docs/sdks/users/README.md
@@ -33,17 +33,10 @@ The users are returned sorted by creation date, with the newest users appearing
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetUserListRequest;
+import com.clerk.backend_api.models.operations.GetUserListResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -67,7 +60,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -79,16 +72,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                   | Type                                                                                                        | Required                                                                                                    | Description                                                                                                 |
-| ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                   | [com.clerk.backend_api.models.operations.GetUserListRequest](../../models/operations/GetUserListRequest.md) | :heavy_check_mark:                                                                                          | The request object to use for the request.                                                                  |
+| Parameter                                                           | Type                                                                | Required                                                            | Description                                                         |
+| ------------------------------------------------------------------- | ------------------------------------------------------------------- | ------------------------------------------------------------------- | ------------------------------------------------------------------- |
+| `request`                                                           | [GetUserListRequest](../../models/operations/GetUserListRequest.md) | :heavy_check_mark:                                                  | The request object to use for the request.                          |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetUserListResponse](../../models/operations/GetUserListResponse.md)**
+**[GetUserListResponse](../../models/operations/GetUserListResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -112,17 +107,10 @@ A rate limit rule of 20 requests per 10 seconds is applied to this endpoint.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateUserRequestBody;
+import com.clerk.backend_api.models.operations.CreateUserResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -145,7 +133,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -157,16 +145,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                         | Type                                                                                                              | Required                                                                                                          | Description                                                                                                       |
-| ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                         | [com.clerk.backend_api.models.operations.CreateUserRequestBody](../../models/operations/CreateUserRequestBody.md) | :heavy_check_mark:                                                                                                | The request object to use for the request.                                                                        |
+| Parameter                                                                 | Type                                                                      | Required                                                                  | Description                                                               |
+| ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- |
+| `request`                                                                 | [CreateUserRequestBody](../../models/operations/CreateUserRequestBody.md) | :heavy_check_mark:                                                        | The request object to use for the request.                                |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateUserResponse](../../models/operations/CreateUserResponse.md)**
+**[CreateUserResponse](../../models/operations/CreateUserResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -184,17 +174,10 @@ Returns a total count of all users that match the given filtering criteria.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetUsersCountRequest;
+import com.clerk.backend_api.models.operations.GetUsersCountResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -217,7 +200,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -229,16 +212,18 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                       | Type                                                                                                            | Required                                                                                                        | Description                                                                                                     |
-| --------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- |
-| `request`                                                                                                       | [com.clerk.backend_api.models.operations.GetUsersCountRequest](../../models/operations/GetUsersCountRequest.md) | :heavy_check_mark:                                                                                              | The request object to use for the request.                                                                      |
+| Parameter                                                               | Type                                                                    | Required                                                                | Description                                                             |
+| ----------------------------------------------------------------------- | ----------------------------------------------------------------------- | ----------------------------------------------------------------------- | ----------------------------------------------------------------------- |
+| `request`                                                               | [GetUsersCountRequest](../../models/operations/GetUsersCountRequest.md) | :heavy_check_mark:                                                      | The request object to use for the request.                              |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetUsersCountResponse](../../models/operations/GetUsersCountResponse.md)**
+**[GetUsersCountResponse](../../models/operations/GetUsersCountResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -256,17 +241,9 @@ Retrieve the details of a user
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetUserResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -286,7 +263,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -298,6 +275,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                      | Type                           | Required                       | Description                    |
@@ -307,7 +286,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetUserResponse](../../models/operations/GetUserResponse.md)**
+**[GetUserResponse](../../models/operations/GetUserResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -336,17 +315,10 @@ You can also choose to sign the user out of all their active sessions on any dev
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateUserRequestBody;
+import com.clerk.backend_api.models.operations.UpdateUserResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -368,7 +340,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -380,17 +352,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                         | Type                                                                                                              | Required                                                                                                          | Description                                                                                                       |
-| ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
-| `userId`                                                                                                          | *String*                                                                                                          | :heavy_check_mark:                                                                                                | The ID of the user to update                                                                                      |
-| `requestBody`                                                                                                     | [com.clerk.backend_api.models.operations.UpdateUserRequestBody](../../models/operations/UpdateUserRequestBody.md) | :heavy_check_mark:                                                                                                | N/A                                                                                                               |
+| Parameter                                                                 | Type                                                                      | Required                                                                  | Description                                                               |
+| ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------- |
+| `userId`                                                                  | *String*                                                                  | :heavy_check_mark:                                                        | The ID of the user to update                                              |
+| `requestBody`                                                             | [UpdateUserRequestBody](../../models/operations/UpdateUserRequestBody.md) | :heavy_check_mark:                                                        | N/A                                                                       |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateUserResponse](../../models/operations/UpdateUserResponse.md)**
+**[UpdateUserResponse](../../models/operations/UpdateUserResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -408,17 +382,9 @@ Delete the specified user
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeleteUserResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -438,7 +404,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -450,6 +416,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                    | Type                         | Required                     | Description                  |
@@ -459,7 +427,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeleteUserResponse](../../models/operations/DeleteUserResponse.md)**
+**[DeleteUserResponse](../../models/operations/DeleteUserResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -477,17 +445,9 @@ Marks the given user as banned, which means that all their sessions are revoked
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.BanUserResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -507,7 +467,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -519,6 +479,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                 | Type                      | Required                  | Description               |
@@ -528,7 +490,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.BanUserResponse](../../models/operations/BanUserResponse.md)**
+**[BanUserResponse](../../models/operations/BanUserResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -546,17 +508,9 @@ Removes the ban mark from the given user.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UnbanUserResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -576,7 +530,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -588,6 +542,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                   | Type                        | Required                    | Description                 |
@@ -597,7 +553,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UnbanUserResponse](../../models/operations/UnbanUserResponse.md)**
+**[UnbanUserResponse](../../models/operations/UnbanUserResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -616,17 +572,9 @@ Lock duration can be configured in the instance's restrictions settings.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.LockUserResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -646,7 +594,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -658,6 +606,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                  | Type                       | Required                   | Description                |
@@ -667,7 +617,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.LockUserResponse](../../models/operations/LockUserResponse.md)**
+**[LockUserResponse](../../models/operations/LockUserResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -685,17 +635,9 @@ Removes the lock from the given user.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UnlockUserResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -715,7 +657,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -727,6 +669,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                    | Type                         | Required                     | Description                  |
@@ -736,7 +680,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UnlockUserResponse](../../models/operations/UnlockUserResponse.md)**
+**[UnlockUserResponse](../../models/operations/UnlockUserResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -754,17 +698,10 @@ Update a user's profile image
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.SetUserProfileImageRequestBody;
+import com.clerk.backend_api.models.operations.SetUserProfileImageResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -786,7 +723,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -798,17 +735,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                           | Type                                                                                                                                | Required                                                                                                                            | Description                                                                                                                         |
-| ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `userId`                                                                                                                            | *String*                                                                                                                            | :heavy_check_mark:                                                                                                                  | The ID of the user to update the profile image for                                                                                  |
-| `requestBody`                                                                                                                       | [com.clerk.backend_api.models.operations.SetUserProfileImageRequestBody](../../models/operations/SetUserProfileImageRequestBody.md) | :heavy_check_mark:                                                                                                                  | N/A                                                                                                                                 |
+| Parameter                                                                                   | Type                                                                                        | Required                                                                                    | Description                                                                                 |
+| ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
+| `userId`                                                                                    | *String*                                                                                    | :heavy_check_mark:                                                                          | The ID of the user to update the profile image for                                          |
+| `requestBody`                                                                               | [SetUserProfileImageRequestBody](../../models/operations/SetUserProfileImageRequestBody.md) | :heavy_check_mark:                                                                          | N/A                                                                                         |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.SetUserProfileImageResponse](../../models/operations/SetUserProfileImageResponse.md)**
+**[SetUserProfileImageResponse](../../models/operations/SetUserProfileImageResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -826,17 +765,9 @@ Delete a user's profile image
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeleteUserProfileImageResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -856,7 +787,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -868,6 +799,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                          | Type                                               | Required                                           | Description                                        |
@@ -877,7 +810,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeleteUserProfileImageResponse](../../models/operations/DeleteUserProfileImageResponse.md)**
+**[DeleteUserProfileImageResponse](../../models/operations/DeleteUserProfileImageResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -902,17 +835,10 @@ You can remove metadata keys at any level by setting their value to `null`.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.UpdateUserMetadataRequestBody;
+import com.clerk.backend_api.models.operations.UpdateUserMetadataResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -934,7 +860,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -946,17 +872,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                             | Type                                                                                                                                                  | Required                                                                                                                                              | Description                                                                                                                                           |
-| ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `userId`                                                                                                                                              | *String*                                                                                                                                              | :heavy_check_mark:                                                                                                                                    | The ID of the user whose metadata will be updated and merged                                                                                          |
-| `requestBody`                                                                                                                                         | [Optional<? extends com.clerk.backend_api.models.operations.UpdateUserMetadataRequestBody>](../../models/operations/UpdateUserMetadataRequestBody.md) | :heavy_minus_sign:                                                                                                                                    | N/A                                                                                                                                                   |
+| Parameter                                                                                           | Type                                                                                                | Required                                                                                            | Description                                                                                         |
+| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
+| `userId`                                                                                            | *String*                                                                                            | :heavy_check_mark:                                                                                  | The ID of the user whose metadata will be updated and merged                                        |
+| `requestBody`                                                                                       | [Optional<UpdateUserMetadataRequestBody>](../../models/operations/UpdateUserMetadataRequestBody.md) | :heavy_minus_sign:                                                                                  | N/A                                                                                                 |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UpdateUserMetadataResponse](../../models/operations/UpdateUserMetadataResponse.md)**
+**[UpdateUserMetadataResponse](../../models/operations/UpdateUserMetadataResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -975,17 +903,9 @@ For OAuth 2.0, if the access token has expired and we have a corresponding refre
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetOAuthAccessTokenResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -1006,7 +926,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -1018,6 +938,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                                       | Type                                                            | Required                                                        | Description                                                     |
@@ -1028,7 +950,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.GetOAuthAccessTokenResponse](../../models/operations/GetOAuthAccessTokenResponse.md)**
+**[GetOAuthAccessTokenResponse](../../models/operations/GetOAuthAccessTokenResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -1046,17 +968,7 @@ Retrieve a paginated list of the user's organization memberships
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import java.lang.Exception;
 
 public class Application {
 
@@ -1087,18 +999,20 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                                                                                                                 | Type                                                                                                                                      | Required                                                                                                                                  | Description                                                                                                                               |
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
 | `userId`                                                                                                                                  | *String*                                                                                                                                  | :heavy_check_mark:                                                                                                                        | The ID of the user whose organization memberships we want to retrieve                                                                     |
-| `limit`                                                                                                                                   | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
-| `offset`                                                                                                                                  | *Optional<? extends Long>*                                                                                                                | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
+| `limit`                                                                                                                                   | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Applies a limit to the number of results returned.<br/>Can be used for paginating the results together with `offset`.                     |
+| `offset`                                                                                                                                  | *Optional<Long>*                                                                                                                          | :heavy_minus_sign:                                                                                                                        | Skip the first `offset` results when paginating.<br/>Needs to be an integer greater or equal to zero.<br/>To be used in conjunction with `limit`. |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsResponse](../../models/operations/UsersGetOrganizationMembershipsResponse.md)**
+**[UsersGetOrganizationMembershipsResponse](../../models/operations/UsersGetOrganizationMembershipsResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -1117,17 +1031,10 @@ Useful for custom auth flows and re-verification.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.VerifyPasswordRequestBody;
+import com.clerk.backend_api.models.operations.VerifyPasswordResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -1150,7 +1057,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -1162,17 +1069,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                                     | Type                                                                                                                                          | Required                                                                                                                                      | Description                                                                                                                                   |
-| --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| `userId`                                                                                                                                      | *String*                                                                                                                                      | :heavy_check_mark:                                                                                                                            | The ID of the user for whom to verify the password                                                                                            |
-| `requestBody`                                                                                                                                 | [Optional<? extends com.clerk.backend_api.models.operations.VerifyPasswordRequestBody>](../../models/operations/VerifyPasswordRequestBody.md) | :heavy_minus_sign:                                                                                                                            | N/A                                                                                                                                           |
+| Parameter                                                                                   | Type                                                                                        | Required                                                                                    | Description                                                                                 |
+| ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
+| `userId`                                                                                    | *String*                                                                                    | :heavy_check_mark:                                                                          | The ID of the user for whom to verify the password                                          |
+| `requestBody`                                                                               | [Optional<VerifyPasswordRequestBody>](../../models/operations/VerifyPasswordRequestBody.md) | :heavy_minus_sign:                                                                          | N/A                                                                                         |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.VerifyPasswordResponse](../../models/operations/VerifyPasswordResponse.md)**
+**[VerifyPasswordResponse](../../models/operations/VerifyPasswordResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -1193,17 +1102,10 @@ Useful for custom auth flows and re-verification.
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.VerifyTOTPRequestBody;
+import com.clerk.backend_api.models.operations.VerifyTOTPResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -1226,7 +1128,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -1238,17 +1140,19 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
-| Parameter                                                                                                                             | Type                                                                                                                                  | Required                                                                                                                              | Description                                                                                                                           |
-| ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
-| `userId`                                                                                                                              | *String*                                                                                                                              | :heavy_check_mark:                                                                                                                    | The ID of the user for whom to verify the TOTP                                                                                        |
-| `requestBody`                                                                                                                         | [Optional<? extends com.clerk.backend_api.models.operations.VerifyTOTPRequestBody>](../../models/operations/VerifyTOTPRequestBody.md) | :heavy_minus_sign:                                                                                                                    | N/A                                                                                                                                   |
+| Parameter                                                                           | Type                                                                                | Required                                                                            | Description                                                                         |
+| ----------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- |
+| `userId`                                                                            | *String*                                                                            | :heavy_check_mark:                                                                  | The ID of the user for whom to verify the TOTP                                      |
+| `requestBody`                                                                       | [Optional<VerifyTOTPRequestBody>](../../models/operations/VerifyTOTPRequestBody.md) | :heavy_minus_sign:                                                                  | N/A                                                                                 |
 
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.VerifyTOTPResponse](../../models/operations/VerifyTOTPResponse.md)**
+**[VerifyTOTPResponse](../../models/operations/VerifyTOTPResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -1266,17 +1170,9 @@ Disable all of a user's MFA methods (e.g. OTP sent via SMS, TOTP on their authen
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DisableMFAResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -1296,7 +1192,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -1308,6 +1204,8 @@ public class Application {
 }
 ```
 
+
+
 ### Parameters
 
 | Parameter                                               | Type                                                    | Required                                                | Description                                             |
@@ -1317,7 +1215,7 @@ public class Application {
 
 ### Response
 
-**[com.clerk.backend_api.models.operations.DisableMFAResponse](../../models/operations/DisableMFAResponse.md)**
+**[DisableMFAResponse](../../models/operations/DisableMFAResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/docs/sdks/webhooks/README.md b/docs/sdks/webhooks/README.md
index 51d51c4..a6336f4 100644
--- a/docs/sdks/webhooks/README.md
+++ b/docs/sdks/webhooks/README.md
@@ -17,17 +17,9 @@ Create a Svix app and associate it with the current instance
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateSvixAppResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -46,7 +38,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -59,9 +51,11 @@ public class Application {
 ```
 
 
+
+
 ### Response
 
-**[com.clerk.backend_api.models.operations.CreateSvixAppResponse](../../models/operations/CreateSvixAppResponse.md)**
+**[CreateSvixAppResponse](../../models/operations/CreateSvixAppResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -79,17 +73,9 @@ Delete a Svix app and disassociate it from the current instance
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.DeleteSvixAppResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -106,7 +92,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -119,9 +105,11 @@ public class Application {
 ```
 
 
+
+
 ### Response
 
-**[com.clerk.backend_api.models.operations.DeleteSvixAppResponse](../../models/operations/DeleteSvixAppResponse.md)**
+**[DeleteSvixAppResponse](../../models/operations/DeleteSvixAppResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
@@ -139,17 +127,9 @@ Generate a new url for accessing the Svix's management dashboard for that partic
 package hello.world;
 
 import com.clerk.backend_api.Clerk;
-import com.clerk.backend_api.models.components.*;
-import com.clerk.backend_api.models.operations.*;
-import com.clerk.backend_api.utils.EventStream;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-import static java.util.Map.entry;
+import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GenerateSvixAuthURLResponse;
+import java.lang.Exception;
 
 public class Application {
 
@@ -168,7 +148,7 @@ public class Application {
         } catch (com.clerk.backend_api.models.errors.ClerkErrors e) {
             // handle exception
             throw e;
-        } catch (com.clerk.backend_api.models.errors.SDKError e) {
+        } catch (SDKError e) {
             // handle exception
             throw e;
         } catch (Exception e) {
@@ -181,9 +161,11 @@ public class Application {
 ```
 
 
+
+
 ### Response
 
-**[com.clerk.backend_api.models.operations.GenerateSvixAuthURLResponse](../../models/operations/GenerateSvixAuthURLResponse.md)**
+**[GenerateSvixAuthURLResponse](../../models/operations/GenerateSvixAuthURLResponse.md)**
 ### Errors
 
 | Error Object              | Status Code               | Content Type              |
diff --git a/src/main/java/com/clerk/backend_api/Actors.java b/src/main/java/com/clerk/backend_api/Actors.java
index 638971d..4a34449 100644
--- a/src/main/java/com/clerk/backend_api/Actors.java
+++ b/src/main/java/com/clerk/backend_api/Actors.java
@@ -4,27 +4,33 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.ActorToken;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateActorTokenRequestBody;
+import com.clerk.backend_api.models.operations.CreateActorTokenRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateActorTokenResponse;
+import com.clerk.backend_api.models.operations.RevokeActorTokenRequest;
+import com.clerk.backend_api.models.operations.RevokeActorTokenRequestBuilder;
+import com.clerk.backend_api.models.operations.RevokeActorTokenResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class Actors implements
             MethodCallCreateActorToken,
@@ -43,8 +49,8 @@ public class Actors implements
      * The `actor` parameter needs to include at least a "sub" key whose value is the ID of the actor (impersonating) user.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateActorTokenRequestBuilder createToken() {
-        return new com.clerk.backend_api.models.operations.CreateActorTokenRequestBuilder(this);
+    public CreateActorTokenRequestBuilder createToken() {
+        return new CreateActorTokenRequestBuilder(this);
     }
 
     /**
@@ -54,9 +60,10 @@ public com.clerk.backend_api.models.operations.CreateActorTokenRequestBuilder cr
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateActorTokenResponse createTokenDirect() throws Exception {
+    public CreateActorTokenResponse createTokenDirect() throws Exception {
         return createToken(Optional.empty());
     }
+    
     /**
      * Create actor token
      * Create an actor token that can be used to impersonate the given user.
@@ -65,18 +72,23 @@ public com.clerk.backend_api.models.operations.CreateActorTokenResponse createTo
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateActorTokenResponse createToken(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateActorTokenRequestBody> request) throws Exception {
+    public CreateActorTokenResponse createToken(
+            Optional<? extends CreateActorTokenRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/actor_tokens");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.CreateActorTokenRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends CreateActorTokenRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -89,7 +101,10 @@ public com.clerk.backend_api.models.operations.CreateActorTokenResponse createTo
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateActorToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateActorToken", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -97,18 +112,28 @@ public com.clerk.backend_api.models.operations.CreateActorTokenResponse createTo
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "402", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateActorToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateActorToken",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateActorToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateActorToken",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateActorToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateActorToken",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -116,42 +141,42 @@ public com.clerk.backend_api.models.operations.CreateActorTokenResponse createTo
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateActorTokenResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateActorTokenResponse
+        CreateActorTokenResponse.Builder _resBuilder = 
+            CreateActorTokenResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateActorTokenResponse _res = _resBuilder.build();
+        CreateActorTokenResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.ActorToken _out = Utils.mapper().readValue(
+                ActorToken _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.ActorToken>() {});
-                _res.withActorToken(java.util.Optional.ofNullable(_out));
+                    new TypeReference<ActorToken>() {});
+                _res.withActorToken(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "402", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -160,13 +185,13 @@ public com.clerk.backend_api.models.operations.CreateActorTokenResponse createTo
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -176,8 +201,8 @@ public com.clerk.backend_api.models.operations.CreateActorTokenResponse createTo
      * Revokes a pending actor token.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.RevokeActorTokenRequestBuilder revokeToken() {
-        return new com.clerk.backend_api.models.operations.RevokeActorTokenRequestBuilder(this);
+    public RevokeActorTokenRequestBuilder revokeToken() {
+        return new RevokeActorTokenRequestBuilder(this);
     }
 
     /**
@@ -187,17 +212,17 @@ public com.clerk.backend_api.models.operations.RevokeActorTokenRequestBuilder re
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.RevokeActorTokenResponse revokeToken(
+    public RevokeActorTokenResponse revokeToken(
             String actorTokenId) throws Exception {
-        com.clerk.backend_api.models.operations.RevokeActorTokenRequest request =
-            com.clerk.backend_api.models.operations.RevokeActorTokenRequest
+        RevokeActorTokenRequest request =
+            RevokeActorTokenRequest
                 .builder()
                 .actorTokenId(actorTokenId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.RevokeActorTokenRequest.class,
+                RevokeActorTokenRequest.class,
                 _baseUrl,
                 "/actor_tokens/{actor_token_id}/revoke",
                 request, null);
@@ -214,7 +239,10 @@ public com.clerk.backend_api.models.operations.RevokeActorTokenResponse revokeTo
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("RevokeActorToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "RevokeActorToken", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -222,18 +250,28 @@ public com.clerk.backend_api.models.operations.RevokeActorTokenResponse revokeTo
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("RevokeActorToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "RevokeActorToken",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("RevokeActorToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "RevokeActorToken",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("RevokeActorToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "RevokeActorToken",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -241,42 +279,42 @@ public com.clerk.backend_api.models.operations.RevokeActorTokenResponse revokeTo
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.RevokeActorTokenResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.RevokeActorTokenResponse
+        RevokeActorTokenResponse.Builder _resBuilder = 
+            RevokeActorTokenResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.RevokeActorTokenResponse _res = _resBuilder.build();
+        RevokeActorTokenResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.ActorToken _out = Utils.mapper().readValue(
+                ActorToken _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.ActorToken>() {});
-                _res.withActorToken(java.util.Optional.ofNullable(_out));
+                    new TypeReference<ActorToken>() {});
+                _res.withActorToken(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -285,13 +323,13 @@ public com.clerk.backend_api.models.operations.RevokeActorTokenResponse revokeTo
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/Allowlist.java b/src/main/java/com/clerk/backend_api/Allowlist.java
index 342bcbe..be379ca 100644
--- a/src/main/java/com/clerk/backend_api/Allowlist.java
+++ b/src/main/java/com/clerk/backend_api/Allowlist.java
@@ -4,27 +4,36 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.AllowlistIdentifier;
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateAllowlistIdentifierRequestBody;
+import com.clerk.backend_api.models.operations.CreateAllowlistIdentifierRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse;
+import com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierRequest;
+import com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierRequestBuilder;
+import com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierResponse;
+import com.clerk.backend_api.models.operations.ListAllowlistIdentifiersRequestBuilder;
+import com.clerk.backend_api.models.operations.ListAllowlistIdentifiersResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class Allowlist implements
             MethodCallListAllowlistIdentifiers,
@@ -43,8 +52,8 @@ public class Allowlist implements
      * Get a list of all identifiers allowed to sign up to an instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.ListAllowlistIdentifiersRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.ListAllowlistIdentifiersRequestBuilder(this);
+    public ListAllowlistIdentifiersRequestBuilder list() {
+        return new ListAllowlistIdentifiersRequestBuilder(this);
     }
 
     /**
@@ -53,7 +62,7 @@ public com.clerk.backend_api.models.operations.ListAllowlistIdentifiersRequestBu
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListAllowlistIdentifiersResponse listDirect() throws Exception {
+    public ListAllowlistIdentifiersResponse listDirect() throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
@@ -71,7 +80,10 @@ public com.clerk.backend_api.models.operations.ListAllowlistIdentifiersResponse
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("ListAllowlistIdentifiers", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "ListAllowlistIdentifiers", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -79,18 +91,28 @@ public com.clerk.backend_api.models.operations.ListAllowlistIdentifiersResponse
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "401", "402", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("ListAllowlistIdentifiers", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "ListAllowlistIdentifiers",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("ListAllowlistIdentifiers", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "ListAllowlistIdentifiers",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("ListAllowlistIdentifiers", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "ListAllowlistIdentifiers",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -98,42 +120,42 @@ public com.clerk.backend_api.models.operations.ListAllowlistIdentifiersResponse
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.ListAllowlistIdentifiersResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.ListAllowlistIdentifiersResponse
+        ListAllowlistIdentifiersResponse.Builder _resBuilder = 
+            ListAllowlistIdentifiersResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.ListAllowlistIdentifiersResponse _res = _resBuilder.build();
+        ListAllowlistIdentifiersResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                java.util.List<com.clerk.backend_api.models.components.AllowlistIdentifier> _out = Utils.mapper().readValue(
+                List<AllowlistIdentifier> _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<java.util.List<com.clerk.backend_api.models.components.AllowlistIdentifier>>() {});
-                _res.withAllowlistIdentifierList(java.util.Optional.ofNullable(_out));
+                    new TypeReference<List<AllowlistIdentifier>>() {});
+                _res.withAllowlistIdentifierList(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "401", "402")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -142,13 +164,13 @@ public com.clerk.backend_api.models.operations.ListAllowlistIdentifiersResponse
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -158,8 +180,8 @@ public com.clerk.backend_api.models.operations.ListAllowlistIdentifiersResponse
      * Create an identifier allowed to sign up to an instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateAllowlistIdentifierRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreateAllowlistIdentifierRequestBuilder(this);
+    public CreateAllowlistIdentifierRequestBuilder create() {
+        return new CreateAllowlistIdentifierRequestBuilder(this);
     }
 
     /**
@@ -168,9 +190,10 @@ public com.clerk.backend_api.models.operations.CreateAllowlistIdentifierRequestB
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse createDirect() throws Exception {
+    public CreateAllowlistIdentifierResponse createDirect() throws Exception {
         return create(Optional.empty());
     }
+    
     /**
      * Add identifier to the allow-list
      * Create an identifier allowed to sign up to an instance
@@ -178,18 +201,23 @@ public com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateAllowlistIdentifierRequestBody> request) throws Exception {
+    public CreateAllowlistIdentifierResponse create(
+            Optional<? extends CreateAllowlistIdentifierRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/allowlist_identifiers");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.CreateAllowlistIdentifierRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends CreateAllowlistIdentifierRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -202,7 +230,10 @@ public com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateAllowlistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateAllowlistIdentifier", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -210,18 +241,28 @@ public com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "402", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateAllowlistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateAllowlistIdentifier",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateAllowlistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateAllowlistIdentifier",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateAllowlistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateAllowlistIdentifier",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -229,42 +270,42 @@ public com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse
+        CreateAllowlistIdentifierResponse.Builder _resBuilder = 
+            CreateAllowlistIdentifierResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse _res = _resBuilder.build();
+        CreateAllowlistIdentifierResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.AllowlistIdentifier _out = Utils.mapper().readValue(
+                AllowlistIdentifier _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.AllowlistIdentifier>() {});
-                _res.withAllowlistIdentifier(java.util.Optional.ofNullable(_out));
+                    new TypeReference<AllowlistIdentifier>() {});
+                _res.withAllowlistIdentifier(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "402", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -273,13 +314,13 @@ public com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -289,8 +330,8 @@ public com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse
      * Delete an identifier from the instance allow-list
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierRequestBuilder delete() {
-        return new com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierRequestBuilder(this);
+    public DeleteAllowlistIdentifierRequestBuilder delete() {
+        return new DeleteAllowlistIdentifierRequestBuilder(this);
     }
 
     /**
@@ -300,17 +341,17 @@ public com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierRequestB
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierResponse delete(
+    public DeleteAllowlistIdentifierResponse delete(
             String identifierId) throws Exception {
-        com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierRequest request =
-            com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierRequest
+        DeleteAllowlistIdentifierRequest request =
+            DeleteAllowlistIdentifierRequest
                 .builder()
                 .identifierId(identifierId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierRequest.class,
+                DeleteAllowlistIdentifierRequest.class,
                 _baseUrl,
                 "/allowlist_identifiers/{identifier_id}",
                 request, null);
@@ -327,7 +368,10 @@ public com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierResponse
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeleteAllowlistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeleteAllowlistIdentifier", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -335,18 +379,28 @@ public com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierResponse
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeleteAllowlistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeleteAllowlistIdentifier",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeleteAllowlistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeleteAllowlistIdentifier",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeleteAllowlistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeleteAllowlistIdentifier",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -354,42 +408,42 @@ public com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierResponse
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierResponse
+        DeleteAllowlistIdentifierResponse.Builder _resBuilder = 
+            DeleteAllowlistIdentifierResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierResponse _res = _resBuilder.build();
+        DeleteAllowlistIdentifierResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.DeletedObject _out = Utils.mapper().readValue(
+                DeletedObject _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.DeletedObject>() {});
-                _res.withDeletedObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<DeletedObject>() {});
+                _res.withDeletedObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -398,13 +452,13 @@ public com.clerk.backend_api.models.operations.DeleteAllowlistIdentifierResponse
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/Blocklist.java b/src/main/java/com/clerk/backend_api/Blocklist.java
index f212daa..fc9be5c 100644
--- a/src/main/java/com/clerk/backend_api/Blocklist.java
+++ b/src/main/java/com/clerk/backend_api/Blocklist.java
@@ -4,27 +4,37 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.BlocklistIdentifier;
+import com.clerk.backend_api.models.components.BlocklistIdentifiers;
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateBlocklistIdentifierRequestBody;
+import com.clerk.backend_api.models.operations.CreateBlocklistIdentifierRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse;
+import com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierRequest;
+import com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierRequestBuilder;
+import com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierResponse;
+import com.clerk.backend_api.models.operations.ListBlocklistIdentifiersRequestBuilder;
+import com.clerk.backend_api.models.operations.ListBlocklistIdentifiersResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class Blocklist implements
             MethodCallListBlocklistIdentifiers,
@@ -43,8 +53,8 @@ public class Blocklist implements
      * Get a list of all identifiers which are not allowed to access an instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.ListBlocklistIdentifiersRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.ListBlocklistIdentifiersRequestBuilder(this);
+    public ListBlocklistIdentifiersRequestBuilder list() {
+        return new ListBlocklistIdentifiersRequestBuilder(this);
     }
 
     /**
@@ -53,7 +63,7 @@ public com.clerk.backend_api.models.operations.ListBlocklistIdentifiersRequestBu
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListBlocklistIdentifiersResponse listDirect() throws Exception {
+    public ListBlocklistIdentifiersResponse listDirect() throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
@@ -71,7 +81,10 @@ public com.clerk.backend_api.models.operations.ListBlocklistIdentifiersResponse
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("ListBlocklistIdentifiers", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "ListBlocklistIdentifiers", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -79,18 +92,28 @@ public com.clerk.backend_api.models.operations.ListBlocklistIdentifiersResponse
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "401", "402", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("ListBlocklistIdentifiers", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "ListBlocklistIdentifiers",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("ListBlocklistIdentifiers", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "ListBlocklistIdentifiers",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("ListBlocklistIdentifiers", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "ListBlocklistIdentifiers",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -98,42 +121,42 @@ public com.clerk.backend_api.models.operations.ListBlocklistIdentifiersResponse
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.ListBlocklistIdentifiersResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.ListBlocklistIdentifiersResponse
+        ListBlocklistIdentifiersResponse.Builder _resBuilder = 
+            ListBlocklistIdentifiersResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.ListBlocklistIdentifiersResponse _res = _resBuilder.build();
+        ListBlocklistIdentifiersResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.BlocklistIdentifiers _out = Utils.mapper().readValue(
+                BlocklistIdentifiers _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.BlocklistIdentifiers>() {});
-                _res.withBlocklistIdentifiers(java.util.Optional.ofNullable(_out));
+                    new TypeReference<BlocklistIdentifiers>() {});
+                _res.withBlocklistIdentifiers(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "401", "402")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -142,13 +165,13 @@ public com.clerk.backend_api.models.operations.ListBlocklistIdentifiersResponse
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -158,8 +181,8 @@ public com.clerk.backend_api.models.operations.ListBlocklistIdentifiersResponse
      * Create an identifier that is blocked from accessing an instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateBlocklistIdentifierRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreateBlocklistIdentifierRequestBuilder(this);
+    public CreateBlocklistIdentifierRequestBuilder create() {
+        return new CreateBlocklistIdentifierRequestBuilder(this);
     }
 
     /**
@@ -168,9 +191,10 @@ public com.clerk.backend_api.models.operations.CreateBlocklistIdentifierRequestB
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse createDirect() throws Exception {
+    public CreateBlocklistIdentifierResponse createDirect() throws Exception {
         return create(Optional.empty());
     }
+    
     /**
      * Add identifier to the block-list
      * Create an identifier that is blocked from accessing an instance
@@ -178,18 +202,23 @@ public com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateBlocklistIdentifierRequestBody> request) throws Exception {
+    public CreateBlocklistIdentifierResponse create(
+            Optional<? extends CreateBlocklistIdentifierRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/blocklist_identifiers");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.CreateBlocklistIdentifierRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends CreateBlocklistIdentifierRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -202,7 +231,10 @@ public com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateBlocklistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateBlocklistIdentifier", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -210,18 +242,28 @@ public com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "402", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateBlocklistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateBlocklistIdentifier",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateBlocklistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateBlocklistIdentifier",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateBlocklistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateBlocklistIdentifier",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -229,42 +271,42 @@ public com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse
+        CreateBlocklistIdentifierResponse.Builder _resBuilder = 
+            CreateBlocklistIdentifierResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse _res = _resBuilder.build();
+        CreateBlocklistIdentifierResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.BlocklistIdentifier _out = Utils.mapper().readValue(
+                BlocklistIdentifier _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.BlocklistIdentifier>() {});
-                _res.withBlocklistIdentifier(java.util.Optional.ofNullable(_out));
+                    new TypeReference<BlocklistIdentifier>() {});
+                _res.withBlocklistIdentifier(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "402", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -273,13 +315,13 @@ public com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -289,8 +331,8 @@ public com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse
      * Delete an identifier from the instance block-list
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierRequestBuilder delete() {
-        return new com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierRequestBuilder(this);
+    public DeleteBlocklistIdentifierRequestBuilder delete() {
+        return new DeleteBlocklistIdentifierRequestBuilder(this);
     }
 
     /**
@@ -300,17 +342,17 @@ public com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierRequestB
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierResponse delete(
+    public DeleteBlocklistIdentifierResponse delete(
             String identifierId) throws Exception {
-        com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierRequest request =
-            com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierRequest
+        DeleteBlocklistIdentifierRequest request =
+            DeleteBlocklistIdentifierRequest
                 .builder()
                 .identifierId(identifierId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierRequest.class,
+                DeleteBlocklistIdentifierRequest.class,
                 _baseUrl,
                 "/blocklist_identifiers/{identifier_id}",
                 request, null);
@@ -327,7 +369,10 @@ public com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierResponse
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeleteBlocklistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeleteBlocklistIdentifier", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -335,18 +380,28 @@ public com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierResponse
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeleteBlocklistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeleteBlocklistIdentifier",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeleteBlocklistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeleteBlocklistIdentifier",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeleteBlocklistIdentifier", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeleteBlocklistIdentifier",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -354,42 +409,42 @@ public com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierResponse
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierResponse
+        DeleteBlocklistIdentifierResponse.Builder _resBuilder = 
+            DeleteBlocklistIdentifierResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierResponse _res = _resBuilder.build();
+        DeleteBlocklistIdentifierResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.DeletedObject _out = Utils.mapper().readValue(
+                DeletedObject _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.DeletedObject>() {});
-                _res.withDeletedObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<DeletedObject>() {});
+                _res.withDeletedObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -398,13 +453,13 @@ public com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierResponse
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/Clerk.java b/src/main/java/com/clerk/backend_api/Clerk.java
index 8fb62d9..94367b9 100644
--- a/src/main/java/com/clerk/backend_api/Clerk.java
+++ b/src/main/java/com/clerk/backend_api/Clerk.java
@@ -6,22 +6,11 @@
 
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
 import com.clerk.backend_api.utils.HTTPClient;
-import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
-import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
-import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.RetryConfig;
 import com.clerk.backend_api.utils.SpeakeasyHTTPClient;
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.http.HttpRequest;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.String;
+import java.util.Map;
 import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
 
 /**
  * Clerk Backend API: The Clerk REST Backend API, meant to be accessed by backend
@@ -265,7 +254,7 @@ public Builder serverURL(String serverUrl) {
          * @param params The parameters to use when templating the URL.
          * @return The builder instance.
          */
-        public Builder serverURL(String serverUrl, java.util.Map<String, String> params) {
+        public Builder serverURL(String serverUrl, Map<String, String> params) {
             this.sdkConfiguration.serverUrl = com.clerk.backend_api.utils.Utils.templateUrl(serverUrl, params);
             return this;
         }
diff --git a/src/main/java/com/clerk/backend_api/Clients.java b/src/main/java/com/clerk/backend_api/Clients.java
index 751f046..99427b1 100644
--- a/src/main/java/com/clerk/backend_api/Clients.java
+++ b/src/main/java/com/clerk/backend_api/Clients.java
@@ -4,32 +4,42 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.Client;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetClientListRequest;
+import com.clerk.backend_api.models.operations.GetClientListRequestBuilder;
+import com.clerk.backend_api.models.operations.GetClientListResponse;
+import com.clerk.backend_api.models.operations.GetClientRequest;
+import com.clerk.backend_api.models.operations.GetClientRequestBuilder;
+import com.clerk.backend_api.models.operations.GetClientResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.VerifyClientRequestBody;
+import com.clerk.backend_api.models.operations.VerifyClientRequestBuilder;
+import com.clerk.backend_api.models.operations.VerifyClientResponse;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.ReadContext;
 import java.io.InputStream;
+import java.lang.Deprecated;
+import java.lang.Exception;
 import java.lang.Long;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Object;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.Optional;
-import org.apache.http.NameValuePair;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.Optional; 
 
 public class Clients implements
             MethodCallGetClientList,
@@ -52,8 +62,8 @@ public class Clients implements
      * @deprecated method: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public com.clerk.backend_api.models.operations.GetClientListRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.GetClientListRequestBuilder(this);
+    public GetClientListRequestBuilder list() {
+        return new GetClientListRequestBuilder(this);
     }
 
     /**
@@ -66,9 +76,10 @@ public com.clerk.backend_api.models.operations.GetClientListRequestBuilder list(
      * @deprecated method: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public com.clerk.backend_api.models.operations.GetClientListResponse listDirect() throws Exception {
+    public GetClientListResponse listDirect() throws Exception {
         return list(Optional.empty(), Optional.empty());
     }
+    
     /**
      * List all clients
      * Returns a list of all clients. The clients are returned sorted by creation date,
@@ -84,11 +95,11 @@ public com.clerk.backend_api.models.operations.GetClientListResponse listDirect(
      * @deprecated method: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public com.clerk.backend_api.models.operations.GetClientListResponse list(
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) throws Exception {
-        com.clerk.backend_api.models.operations.GetClientListRequest request =
-            com.clerk.backend_api.models.operations.GetClientListRequest
+    public GetClientListResponse list(
+            Optional<Long> limit,
+            Optional<Long> offset) throws Exception {
+        GetClientListRequest request =
+            GetClientListRequest
                 .builder()
                 .limit(limit)
                 .offset(offset)
@@ -105,7 +116,7 @@ public com.clerk.backend_api.models.operations.GetClientListResponse list(
                 this.sdkConfiguration.userAgent);
 
         _req.addQueryParams(Utils.getQueryParams(
-                com.clerk.backend_api.models.operations.GetClientListRequest.class,
+                GetClientListRequest.class,
                 request, 
                 null));
 
@@ -116,7 +127,10 @@ public com.clerk.backend_api.models.operations.GetClientListResponse list(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetClientList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetClientList", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -124,18 +138,28 @@ public com.clerk.backend_api.models.operations.GetClientListResponse list(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "410", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetClientList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetClientList",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetClientList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetClientList",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetClientList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetClientList",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -143,11 +167,11 @@ public com.clerk.backend_api.models.operations.GetClientListResponse list(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        byte[] _fullResponse = Utils.toByteArrayAndClose(_httpRes.body());
+        byte[] _fullResponse = Utils.extractByteArrayFromBody(_httpRes);
         
         @SuppressWarnings("deprecation")
-        com.clerk.backend_api.models.operations.GetClientListResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetClientListResponse
+        GetClientListResponse.Builder _resBuilder = 
+            GetClientListResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
@@ -170,21 +194,21 @@ public com.clerk.backend_api.models.operations.GetClientListResponse list(
                     if (_firstResult.size() < _resolvedLimit) {
                         return Optional.empty();
                     };
-                    long _newOffset = _requestOffset + _firstResult.size();
-                    com.clerk.backend_api.models.operations.GetClientListRequestBuilder _ret = list();
+                    long _newOffset = _requestOffset + _firstResult.size(); 
+                    GetClientListRequestBuilder _ret = list();
                     _ret.limit(_resolvedLimit);
                     _ret.offset(_newOffset);
                     return Optional.of(_ret.call());
                 });
 
-        com.clerk.backend_api.models.operations.GetClientListResponse _res = _resBuilder.build();
+        GetClientListResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                java.util.List<com.clerk.backend_api.models.components.Client> _out = Utils.mapper().readValue(
+                List<Client> _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
-                    new TypeReference<java.util.List<com.clerk.backend_api.models.components.Client>>() {});
-                _res.withClientList(java.util.Optional.ofNullable(_out));
+                    new TypeReference<List<Client>>() {});
+                _res.withClientList(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
@@ -196,9 +220,9 @@ public com.clerk.backend_api.models.operations.GetClientListResponse list(
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "410", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
@@ -230,8 +254,8 @@ public com.clerk.backend_api.models.operations.GetClientListResponse list(
      * Verifies the client in the provided token
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.VerifyClientRequestBuilder verify() {
-        return new com.clerk.backend_api.models.operations.VerifyClientRequestBuilder(this);
+    public VerifyClientRequestBuilder verify() {
+        return new VerifyClientRequestBuilder(this);
     }
 
     /**
@@ -240,9 +264,10 @@ public com.clerk.backend_api.models.operations.VerifyClientRequestBuilder verify
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.VerifyClientResponse verifyDirect() throws Exception {
+    public VerifyClientResponse verifyDirect() throws Exception {
         return verify(Optional.empty());
     }
+    
     /**
      * Verify a client
      * Verifies the client in the provided token
@@ -250,18 +275,23 @@ public com.clerk.backend_api.models.operations.VerifyClientResponse verifyDirect
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.VerifyClientResponse verify(
-            Optional<? extends com.clerk.backend_api.models.operations.VerifyClientRequestBody> request) throws Exception {
+    public VerifyClientResponse verify(
+            Optional<? extends VerifyClientRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/clients/verify");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.VerifyClientRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends VerifyClientRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -274,7 +304,10 @@ public com.clerk.backend_api.models.operations.VerifyClientResponse verify(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("VerifyClient", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "VerifyClient", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -282,18 +315,28 @@ public com.clerk.backend_api.models.operations.VerifyClientResponse verify(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("VerifyClient", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "VerifyClient",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("VerifyClient", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "VerifyClient",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("VerifyClient", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "VerifyClient",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -301,42 +344,42 @@ public com.clerk.backend_api.models.operations.VerifyClientResponse verify(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.VerifyClientResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.VerifyClientResponse
+        VerifyClientResponse.Builder _resBuilder = 
+            VerifyClientResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.VerifyClientResponse _res = _resBuilder.build();
+        VerifyClientResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Client _out = Utils.mapper().readValue(
+                Client _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Client>() {});
-                _res.withClient(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Client>() {});
+                _res.withClient(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -345,13 +388,13 @@ public com.clerk.backend_api.models.operations.VerifyClientResponse verify(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -361,8 +404,8 @@ public com.clerk.backend_api.models.operations.VerifyClientResponse verify(
      * Returns the details of a client.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetClientRequestBuilder get() {
-        return new com.clerk.backend_api.models.operations.GetClientRequestBuilder(this);
+    public GetClientRequestBuilder get() {
+        return new GetClientRequestBuilder(this);
     }
 
     /**
@@ -372,17 +415,17 @@ public com.clerk.backend_api.models.operations.GetClientRequestBuilder get() {
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetClientResponse get(
+    public GetClientResponse get(
             String clientId) throws Exception {
-        com.clerk.backend_api.models.operations.GetClientRequest request =
-            com.clerk.backend_api.models.operations.GetClientRequest
+        GetClientRequest request =
+            GetClientRequest
                 .builder()
                 .clientId(clientId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.GetClientRequest.class,
+                GetClientRequest.class,
                 _baseUrl,
                 "/clients/{client_id}",
                 request, null);
@@ -399,7 +442,10 @@ public com.clerk.backend_api.models.operations.GetClientResponse get(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetClient", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetClient", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -407,18 +453,28 @@ public com.clerk.backend_api.models.operations.GetClientResponse get(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetClient", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetClient",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetClient", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetClient",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetClient", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetClient",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -426,42 +482,42 @@ public com.clerk.backend_api.models.operations.GetClientResponse get(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetClientResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetClientResponse
+        GetClientResponse.Builder _resBuilder = 
+            GetClientResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetClientResponse _res = _resBuilder.build();
+        GetClientResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Client _out = Utils.mapper().readValue(
+                Client _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Client>() {});
-                _res.withClient(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Client>() {});
+                _res.withClient(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -470,13 +526,13 @@ public com.clerk.backend_api.models.operations.GetClientResponse get(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/Domains.java b/src/main/java/com/clerk/backend_api/Domains.java
index b2ab850..77e6e65 100644
--- a/src/main/java/com/clerk/backend_api/Domains.java
+++ b/src/main/java/com/clerk/backend_api/Domains.java
@@ -4,27 +4,40 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.models.components.Domain;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.AddDomainRequestBody;
+import com.clerk.backend_api.models.operations.AddDomainRequestBuilder;
+import com.clerk.backend_api.models.operations.AddDomainResponse;
+import com.clerk.backend_api.models.operations.DeleteDomainRequest;
+import com.clerk.backend_api.models.operations.DeleteDomainRequestBuilder;
+import com.clerk.backend_api.models.operations.DeleteDomainResponse;
+import com.clerk.backend_api.models.operations.ListDomainsRequestBuilder;
+import com.clerk.backend_api.models.operations.ListDomainsResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.UpdateDomainRequest;
+import com.clerk.backend_api.models.operations.UpdateDomainRequestBody;
+import com.clerk.backend_api.models.operations.UpdateDomainRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateDomainResponse;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class Domains implements
             MethodCallListDomains,
@@ -45,8 +58,8 @@ public class Domains implements
      * The response will contain the primary domain for the instance and any satellite domains. Each domain in the response contains information about the URLs where Clerk operates and the required CNAME targets.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.ListDomainsRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.ListDomainsRequestBuilder(this);
+    public ListDomainsRequestBuilder list() {
+        return new ListDomainsRequestBuilder(this);
     }
 
     /**
@@ -56,7 +69,7 @@ public com.clerk.backend_api.models.operations.ListDomainsRequestBuilder list()
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListDomainsResponse listDirect() throws Exception {
+    public ListDomainsResponse listDirect() throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
@@ -74,7 +87,10 @@ public com.clerk.backend_api.models.operations.ListDomainsResponse listDirect()
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("ListDomains", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "ListDomains", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -82,18 +98,28 @@ public com.clerk.backend_api.models.operations.ListDomainsResponse listDirect()
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("ListDomains", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "ListDomains",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("ListDomains", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "ListDomains",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("ListDomains", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "ListDomains",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -101,28 +127,28 @@ public com.clerk.backend_api.models.operations.ListDomainsResponse listDirect()
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.ListDomainsResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.ListDomainsResponse
+        ListDomainsResponse.Builder _resBuilder = 
+            ListDomainsResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.ListDomainsResponse _res = _resBuilder.build();
+        ListDomainsResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
                 com.clerk.backend_api.models.components.Domains _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
                     new TypeReference<com.clerk.backend_api.models.components.Domains>() {});
-                _res.withDomains(java.util.Optional.ofNullable(_out));
+                _res.withDomains(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -131,13 +157,13 @@ public com.clerk.backend_api.models.operations.ListDomainsResponse listDirect()
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -151,8 +177,8 @@ public com.clerk.backend_api.models.operations.ListDomainsResponse listDirect()
      * If you're planning to configure the new satellite domain to run behind a proxy, pass the `proxy_url` parameter accordingly.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.AddDomainRequestBuilder add() {
-        return new com.clerk.backend_api.models.operations.AddDomainRequestBuilder(this);
+    public AddDomainRequestBuilder add() {
+        return new AddDomainRequestBuilder(this);
     }
 
     /**
@@ -165,9 +191,10 @@ public com.clerk.backend_api.models.operations.AddDomainRequestBuilder add() {
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.AddDomainResponse addDirect() throws Exception {
+    public AddDomainResponse addDirect() throws Exception {
         return add(Optional.empty());
     }
+    
     /**
      * Add a domain
      * Add a new domain for your instance.
@@ -179,18 +206,23 @@ public com.clerk.backend_api.models.operations.AddDomainResponse addDirect() thr
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.AddDomainResponse add(
-            Optional<? extends com.clerk.backend_api.models.operations.AddDomainRequestBody> request) throws Exception {
+    public AddDomainResponse add(
+            Optional<? extends AddDomainRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/domains");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.AddDomainRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends AddDomainRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -203,7 +235,10 @@ public com.clerk.backend_api.models.operations.AddDomainResponse add(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("AddDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "AddDomain", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -211,18 +246,28 @@ public com.clerk.backend_api.models.operations.AddDomainResponse add(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "402", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("AddDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "AddDomain",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("AddDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "AddDomain",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("AddDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "AddDomain",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -230,42 +275,42 @@ public com.clerk.backend_api.models.operations.AddDomainResponse add(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.AddDomainResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.AddDomainResponse
+        AddDomainResponse.Builder _resBuilder = 
+            AddDomainResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.AddDomainResponse _res = _resBuilder.build();
+        AddDomainResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Domain _out = Utils.mapper().readValue(
+                Domain _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Domain>() {});
-                _res.withDomain(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Domain>() {});
+                _res.withDomain(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "402", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -274,13 +319,13 @@ public com.clerk.backend_api.models.operations.AddDomainResponse add(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -291,8 +336,8 @@ public com.clerk.backend_api.models.operations.AddDomainResponse add(
      * It is currently not possible to delete the instance's primary domain.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeleteDomainRequestBuilder delete() {
-        return new com.clerk.backend_api.models.operations.DeleteDomainRequestBuilder(this);
+    public DeleteDomainRequestBuilder delete() {
+        return new DeleteDomainRequestBuilder(this);
     }
 
     /**
@@ -303,17 +348,17 @@ public com.clerk.backend_api.models.operations.DeleteDomainRequestBuilder delete
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeleteDomainResponse delete(
+    public DeleteDomainResponse delete(
             String domainId) throws Exception {
-        com.clerk.backend_api.models.operations.DeleteDomainRequest request =
-            com.clerk.backend_api.models.operations.DeleteDomainRequest
+        DeleteDomainRequest request =
+            DeleteDomainRequest
                 .builder()
                 .domainId(domainId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DeleteDomainRequest.class,
+                DeleteDomainRequest.class,
                 _baseUrl,
                 "/domains/{domain_id}",
                 request, null);
@@ -330,7 +375,10 @@ public com.clerk.backend_api.models.operations.DeleteDomainResponse delete(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeleteDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeleteDomain", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -338,18 +386,28 @@ public com.clerk.backend_api.models.operations.DeleteDomainResponse delete(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeleteDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeleteDomain",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeleteDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeleteDomain",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeleteDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeleteDomain",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -357,42 +415,42 @@ public com.clerk.backend_api.models.operations.DeleteDomainResponse delete(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeleteDomainResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeleteDomainResponse
+        DeleteDomainResponse.Builder _resBuilder = 
+            DeleteDomainResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeleteDomainResponse _res = _resBuilder.build();
+        DeleteDomainResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.DeletedObject _out = Utils.mapper().readValue(
+                DeletedObject _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.DeletedObject>() {});
-                _res.withDeletedObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<DeletedObject>() {});
+                _res.withDeletedObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -401,13 +459,13 @@ public com.clerk.backend_api.models.operations.DeleteDomainResponse delete(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -424,8 +482,8 @@ public com.clerk.backend_api.models.operations.DeleteDomainResponse delete(
      * update the instance's home origin, affecting the default application paths.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateDomainRequestBuilder update() {
-        return new com.clerk.backend_api.models.operations.UpdateDomainRequestBuilder(this);
+    public UpdateDomainRequestBuilder update() {
+        return new UpdateDomainRequestBuilder(this);
     }
 
     /**
@@ -443,11 +501,11 @@ public com.clerk.backend_api.models.operations.UpdateDomainRequestBuilder update
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateDomainResponse update(
+    public UpdateDomainResponse update(
             String domainId,
-            com.clerk.backend_api.models.operations.UpdateDomainRequestBody requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.UpdateDomainRequest request =
-            com.clerk.backend_api.models.operations.UpdateDomainRequest
+            UpdateDomainRequestBody requestBody) throws Exception {
+        UpdateDomainRequest request =
+            UpdateDomainRequest
                 .builder()
                 .domainId(domainId)
                 .requestBody(requestBody)
@@ -455,16 +513,21 @@ public com.clerk.backend_api.models.operations.UpdateDomainResponse update(
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UpdateDomainRequest.class,
+                UpdateDomainRequest.class,
                 _baseUrl,
                 "/domains/{domain_id}",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         if (_serializedRequestBody == null) {
             throw new Exception("Request body is required");
         }
@@ -480,7 +543,10 @@ public com.clerk.backend_api.models.operations.UpdateDomainResponse update(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateDomain", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -488,18 +554,28 @@ public com.clerk.backend_api.models.operations.UpdateDomainResponse update(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateDomain",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateDomain",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateDomain",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -507,42 +583,42 @@ public com.clerk.backend_api.models.operations.UpdateDomainResponse update(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateDomainResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateDomainResponse
+        UpdateDomainResponse.Builder _resBuilder = 
+            UpdateDomainResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateDomainResponse _res = _resBuilder.build();
+        UpdateDomainResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Domain _out = Utils.mapper().readValue(
+                Domain _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Domain>() {});
-                _res.withDomain(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Domain>() {});
+                _res.withDomain(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -551,13 +627,13 @@ public com.clerk.backend_api.models.operations.UpdateDomainResponse update(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/EmailAddresses.java b/src/main/java/com/clerk/backend_api/EmailAddresses.java
index c4635b5..48e48ed 100644
--- a/src/main/java/com/clerk/backend_api/EmailAddresses.java
+++ b/src/main/java/com/clerk/backend_api/EmailAddresses.java
@@ -4,27 +4,41 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.models.components.EmailAddress;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateEmailAddressRequestBody;
+import com.clerk.backend_api.models.operations.CreateEmailAddressRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateEmailAddressResponse;
+import com.clerk.backend_api.models.operations.DeleteEmailAddressRequest;
+import com.clerk.backend_api.models.operations.DeleteEmailAddressRequestBuilder;
+import com.clerk.backend_api.models.operations.DeleteEmailAddressResponse;
+import com.clerk.backend_api.models.operations.GetEmailAddressRequest;
+import com.clerk.backend_api.models.operations.GetEmailAddressRequestBuilder;
+import com.clerk.backend_api.models.operations.GetEmailAddressResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.UpdateEmailAddressRequest;
+import com.clerk.backend_api.models.operations.UpdateEmailAddressRequestBody;
+import com.clerk.backend_api.models.operations.UpdateEmailAddressRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateEmailAddressResponse;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class EmailAddresses implements
             MethodCallCreateEmailAddress,
@@ -44,8 +58,8 @@ public class EmailAddresses implements
      * Create a new email address
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateEmailAddressRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreateEmailAddressRequestBuilder(this);
+    public CreateEmailAddressRequestBuilder create() {
+        return new CreateEmailAddressRequestBuilder(this);
     }
 
     /**
@@ -54,9 +68,10 @@ public com.clerk.backend_api.models.operations.CreateEmailAddressRequestBuilder
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateEmailAddressResponse createDirect() throws Exception {
+    public CreateEmailAddressResponse createDirect() throws Exception {
         return create(Optional.empty());
     }
+    
     /**
      * Create an email address
      * Create a new email address
@@ -64,18 +79,23 @@ public com.clerk.backend_api.models.operations.CreateEmailAddressResponse create
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateEmailAddressResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateEmailAddressRequestBody> request) throws Exception {
+    public CreateEmailAddressResponse create(
+            Optional<? extends CreateEmailAddressRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/email_addresses");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.CreateEmailAddressRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends CreateEmailAddressRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -88,7 +108,10 @@ public com.clerk.backend_api.models.operations.CreateEmailAddressResponse create
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateEmailAddress", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -96,18 +119,28 @@ public com.clerk.backend_api.models.operations.CreateEmailAddressResponse create
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateEmailAddress",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateEmailAddress",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateEmailAddress",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -115,42 +148,42 @@ public com.clerk.backend_api.models.operations.CreateEmailAddressResponse create
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateEmailAddressResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateEmailAddressResponse
+        CreateEmailAddressResponse.Builder _resBuilder = 
+            CreateEmailAddressResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateEmailAddressResponse _res = _resBuilder.build();
+        CreateEmailAddressResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.EmailAddress _out = Utils.mapper().readValue(
+                EmailAddress _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.EmailAddress>() {});
-                _res.withEmailAddress(java.util.Optional.ofNullable(_out));
+                    new TypeReference<EmailAddress>() {});
+                _res.withEmailAddress(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -159,13 +192,13 @@ public com.clerk.backend_api.models.operations.CreateEmailAddressResponse create
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -175,8 +208,8 @@ public com.clerk.backend_api.models.operations.CreateEmailAddressResponse create
      * Returns the details of an email address.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetEmailAddressRequestBuilder get() {
-        return new com.clerk.backend_api.models.operations.GetEmailAddressRequestBuilder(this);
+    public GetEmailAddressRequestBuilder get() {
+        return new GetEmailAddressRequestBuilder(this);
     }
 
     /**
@@ -186,17 +219,17 @@ public com.clerk.backend_api.models.operations.GetEmailAddressRequestBuilder get
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetEmailAddressResponse get(
+    public GetEmailAddressResponse get(
             String emailAddressId) throws Exception {
-        com.clerk.backend_api.models.operations.GetEmailAddressRequest request =
-            com.clerk.backend_api.models.operations.GetEmailAddressRequest
+        GetEmailAddressRequest request =
+            GetEmailAddressRequest
                 .builder()
                 .emailAddressId(emailAddressId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.GetEmailAddressRequest.class,
+                GetEmailAddressRequest.class,
                 _baseUrl,
                 "/email_addresses/{email_address_id}",
                 request, null);
@@ -213,7 +246,10 @@ public com.clerk.backend_api.models.operations.GetEmailAddressResponse get(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetEmailAddress", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -221,18 +257,28 @@ public com.clerk.backend_api.models.operations.GetEmailAddressResponse get(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetEmailAddress",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetEmailAddress",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetEmailAddress",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -240,42 +286,42 @@ public com.clerk.backend_api.models.operations.GetEmailAddressResponse get(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetEmailAddressResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetEmailAddressResponse
+        GetEmailAddressResponse.Builder _resBuilder = 
+            GetEmailAddressResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetEmailAddressResponse _res = _resBuilder.build();
+        GetEmailAddressResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.EmailAddress _out = Utils.mapper().readValue(
+                EmailAddress _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.EmailAddress>() {});
-                _res.withEmailAddress(java.util.Optional.ofNullable(_out));
+                    new TypeReference<EmailAddress>() {});
+                _res.withEmailAddress(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -284,13 +330,13 @@ public com.clerk.backend_api.models.operations.GetEmailAddressResponse get(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -300,8 +346,8 @@ public com.clerk.backend_api.models.operations.GetEmailAddressResponse get(
      * Delete the email address with the given ID
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeleteEmailAddressRequestBuilder delete() {
-        return new com.clerk.backend_api.models.operations.DeleteEmailAddressRequestBuilder(this);
+    public DeleteEmailAddressRequestBuilder delete() {
+        return new DeleteEmailAddressRequestBuilder(this);
     }
 
     /**
@@ -311,17 +357,17 @@ public com.clerk.backend_api.models.operations.DeleteEmailAddressRequestBuilder
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeleteEmailAddressResponse delete(
+    public DeleteEmailAddressResponse delete(
             String emailAddressId) throws Exception {
-        com.clerk.backend_api.models.operations.DeleteEmailAddressRequest request =
-            com.clerk.backend_api.models.operations.DeleteEmailAddressRequest
+        DeleteEmailAddressRequest request =
+            DeleteEmailAddressRequest
                 .builder()
                 .emailAddressId(emailAddressId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DeleteEmailAddressRequest.class,
+                DeleteEmailAddressRequest.class,
                 _baseUrl,
                 "/email_addresses/{email_address_id}",
                 request, null);
@@ -338,7 +384,10 @@ public com.clerk.backend_api.models.operations.DeleteEmailAddressResponse delete
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeleteEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeleteEmailAddress", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -346,18 +395,28 @@ public com.clerk.backend_api.models.operations.DeleteEmailAddressResponse delete
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeleteEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeleteEmailAddress",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeleteEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeleteEmailAddress",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeleteEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeleteEmailAddress",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -365,42 +424,42 @@ public com.clerk.backend_api.models.operations.DeleteEmailAddressResponse delete
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeleteEmailAddressResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeleteEmailAddressResponse
+        DeleteEmailAddressResponse.Builder _resBuilder = 
+            DeleteEmailAddressResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeleteEmailAddressResponse _res = _resBuilder.build();
+        DeleteEmailAddressResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.DeletedObject _out = Utils.mapper().readValue(
+                DeletedObject _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.DeletedObject>() {});
-                _res.withDeletedObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<DeletedObject>() {});
+                _res.withDeletedObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -409,13 +468,13 @@ public com.clerk.backend_api.models.operations.DeleteEmailAddressResponse delete
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -425,8 +484,8 @@ public com.clerk.backend_api.models.operations.DeleteEmailAddressResponse delete
      * Updates an email address.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateEmailAddressRequestBuilder update() {
-        return new com.clerk.backend_api.models.operations.UpdateEmailAddressRequestBuilder(this);
+    public UpdateEmailAddressRequestBuilder update() {
+        return new UpdateEmailAddressRequestBuilder(this);
     }
 
     /**
@@ -436,10 +495,11 @@ public com.clerk.backend_api.models.operations.UpdateEmailAddressRequestBuilder
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateEmailAddressResponse update(
+    public UpdateEmailAddressResponse update(
             String emailAddressId) throws Exception {
         return update(emailAddressId, Optional.empty());
     }
+    
     /**
      * Update an email address
      * Updates an email address.
@@ -448,11 +508,11 @@ public com.clerk.backend_api.models.operations.UpdateEmailAddressResponse update
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateEmailAddressResponse update(
+    public UpdateEmailAddressResponse update(
             String emailAddressId,
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateEmailAddressRequestBody> requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.UpdateEmailAddressRequest request =
-            com.clerk.backend_api.models.operations.UpdateEmailAddressRequest
+            Optional<? extends UpdateEmailAddressRequestBody> requestBody) throws Exception {
+        UpdateEmailAddressRequest request =
+            UpdateEmailAddressRequest
                 .builder()
                 .emailAddressId(emailAddressId)
                 .requestBody(requestBody)
@@ -460,16 +520,21 @@ public com.clerk.backend_api.models.operations.UpdateEmailAddressResponse update
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UpdateEmailAddressRequest.class,
+                UpdateEmailAddressRequest.class,
                 _baseUrl,
                 "/email_addresses/{email_address_id}",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -482,7 +547,10 @@ public com.clerk.backend_api.models.operations.UpdateEmailAddressResponse update
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateEmailAddress", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -490,18 +558,28 @@ public com.clerk.backend_api.models.operations.UpdateEmailAddressResponse update
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateEmailAddress",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateEmailAddress",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateEmailAddress", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateEmailAddress",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -509,42 +587,42 @@ public com.clerk.backend_api.models.operations.UpdateEmailAddressResponse update
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateEmailAddressResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateEmailAddressResponse
+        UpdateEmailAddressResponse.Builder _resBuilder = 
+            UpdateEmailAddressResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateEmailAddressResponse _res = _resBuilder.build();
+        UpdateEmailAddressResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.EmailAddress _out = Utils.mapper().readValue(
+                EmailAddress _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.EmailAddress>() {});
-                _res.withEmailAddress(java.util.Optional.ofNullable(_out));
+                    new TypeReference<EmailAddress>() {});
+                _res.withEmailAddress(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -553,13 +631,13 @@ public com.clerk.backend_api.models.operations.UpdateEmailAddressResponse update
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/Instance.java b/src/main/java/com/clerk/backend_api/Instance.java
index 8b29b46..aa4d627 100644
--- a/src/main/java/com/clerk/backend_api/Instance.java
+++ b/src/main/java/com/clerk/backend_api/Instance.java
@@ -4,27 +4,48 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.InstanceRestrictions;
+import com.clerk.backend_api.models.components.InstanceSettings;
+import com.clerk.backend_api.models.components.OrganizationSettings;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRequestBody;
+import com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRequestBuilder;
+import com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigRequestBody;
+import com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse;
+import com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsRequestBody;
+import com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsResponse;
+import com.clerk.backend_api.models.operations.UpdateInstanceRequestBody;
+import com.clerk.backend_api.models.operations.UpdateInstanceRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateInstanceResponse;
+import com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRequestBody;
+import com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsResponse;
+import com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRequestBody;
+import com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainResponse;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Deprecated;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class Instance implements
             MethodCallUpdateInstanceAuthConfig,
@@ -46,8 +67,8 @@ public class Instance implements
      * Updates the settings of an instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigRequestBuilder updateAuthConfig() {
-        return new com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigRequestBuilder(this);
+    public UpdateInstanceAuthConfigRequestBuilder updateAuthConfig() {
+        return new UpdateInstanceAuthConfigRequestBuilder(this);
     }
 
     /**
@@ -56,9 +77,10 @@ public com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigRequestBu
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse updateAuthConfigDirect() throws Exception {
+    public UpdateInstanceAuthConfigResponse updateAuthConfigDirect() throws Exception {
         return updateAuthConfig(Optional.empty());
     }
+    
     /**
      * Update instance settings
      * Updates the settings of an instance
@@ -66,18 +88,23 @@ public com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse updateAuthConfig(
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigRequestBody> request) throws Exception {
+    public UpdateInstanceAuthConfigResponse updateAuthConfig(
+            Optional<? extends UpdateInstanceAuthConfigRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/beta_features/instance_settings");
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends UpdateInstanceAuthConfigRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -90,7 +117,10 @@ public com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateInstanceAuthConfig", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateInstanceAuthConfig", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -98,18 +128,28 @@ public com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateInstanceAuthConfig", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateInstanceAuthConfig",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateInstanceAuthConfig", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateInstanceAuthConfig",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateInstanceAuthConfig", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateInstanceAuthConfig",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -117,42 +157,42 @@ public com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse
+        UpdateInstanceAuthConfigResponse.Builder _resBuilder = 
+            UpdateInstanceAuthConfigResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse _res = _resBuilder.build();
+        UpdateInstanceAuthConfigResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.InstanceSettings _out = Utils.mapper().readValue(
+                InstanceSettings _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.InstanceSettings>() {});
-                _res.withInstanceSettings(java.util.Optional.ofNullable(_out));
+                    new TypeReference<InstanceSettings>() {});
+                _res.withInstanceSettings(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -161,13 +201,13 @@ public com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -183,8 +223,8 @@ public com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse
      * @deprecated method: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRequestBuilder updateProductionDomain() {
-        return new com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRequestBuilder(this);
+    public UpdateProductionInstanceDomainRequestBuilder updateProductionDomain() {
+        return new UpdateProductionInstanceDomainRequestBuilder(this);
     }
 
     /**
@@ -199,9 +239,10 @@ public com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainReq
      * @deprecated method: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainResponse updateProductionDomainDirect() throws Exception {
+    public UpdateProductionInstanceDomainResponse updateProductionDomainDirect() throws Exception {
         return updateProductionDomain(Optional.empty());
     }
+    
     /**
      * Update production instance domain
      * Change the domain of a production instance.
@@ -215,18 +256,23 @@ public com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRes
      * @deprecated method: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainResponse updateProductionDomain(
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRequestBody> request) throws Exception {
+    public UpdateProductionInstanceDomainResponse updateProductionDomain(
+            Optional<? extends UpdateProductionInstanceDomainRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/beta_features/domain");
         
         HTTPRequest _req = new HTTPRequest(_url, "PUT");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends UpdateProductionInstanceDomainRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -239,7 +285,10 @@ public com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRes
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateProductionInstanceDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateProductionInstanceDomain", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -247,18 +296,28 @@ public com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRes
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateProductionInstanceDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateProductionInstanceDomain",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateProductionInstanceDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateProductionInstanceDomain",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateProductionInstanceDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateProductionInstanceDomain",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -266,14 +325,14 @@ public com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRes
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainResponse
+        UpdateProductionInstanceDomainResponse.Builder _resBuilder = 
+            UpdateProductionInstanceDomainResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainResponse _res = _resBuilder.build();
+        UpdateProductionInstanceDomainResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "202")) {
             // no content 
@@ -281,16 +340,16 @@ public com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRes
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -299,13 +358,13 @@ public com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRes
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -315,8 +374,8 @@ public com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRes
      * Updates the settings of an instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateInstanceRequestBuilder update() {
-        return new com.clerk.backend_api.models.operations.UpdateInstanceRequestBuilder(this);
+    public UpdateInstanceRequestBuilder update() {
+        return new UpdateInstanceRequestBuilder(this);
     }
 
     /**
@@ -325,9 +384,10 @@ public com.clerk.backend_api.models.operations.UpdateInstanceRequestBuilder upda
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateInstanceResponse updateDirect() throws Exception {
+    public UpdateInstanceResponse updateDirect() throws Exception {
         return update(Optional.empty());
     }
+    
     /**
      * Update instance settings
      * Updates the settings of an instance
@@ -335,18 +395,23 @@ public com.clerk.backend_api.models.operations.UpdateInstanceResponse updateDire
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateInstanceResponse update(
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceRequestBody> request) throws Exception {
+    public UpdateInstanceResponse update(
+            Optional<? extends UpdateInstanceRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/instance");
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends UpdateInstanceRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -359,7 +424,10 @@ public com.clerk.backend_api.models.operations.UpdateInstanceResponse update(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateInstance", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateInstance", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -367,18 +435,28 @@ public com.clerk.backend_api.models.operations.UpdateInstanceResponse update(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateInstance", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateInstance",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateInstance", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateInstance",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateInstance", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateInstance",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -386,14 +464,14 @@ public com.clerk.backend_api.models.operations.UpdateInstanceResponse update(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateInstanceResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateInstanceResponse
+        UpdateInstanceResponse.Builder _resBuilder = 
+            UpdateInstanceResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateInstanceResponse _res = _resBuilder.build();
+        UpdateInstanceResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "204")) {
             // no content 
@@ -401,16 +479,16 @@ public com.clerk.backend_api.models.operations.UpdateInstanceResponse update(
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -419,13 +497,13 @@ public com.clerk.backend_api.models.operations.UpdateInstanceResponse update(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -435,8 +513,8 @@ public com.clerk.backend_api.models.operations.UpdateInstanceResponse update(
      * Updates the restriction settings of an instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRequestBuilder updateRestrictions() {
-        return new com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRequestBuilder(this);
+    public UpdateInstanceRestrictionsRequestBuilder updateRestrictions() {
+        return new UpdateInstanceRestrictionsRequestBuilder(this);
     }
 
     /**
@@ -445,9 +523,10 @@ public com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRequest
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsResponse updateRestrictionsDirect() throws Exception {
+    public UpdateInstanceRestrictionsResponse updateRestrictionsDirect() throws Exception {
         return updateRestrictions(Optional.empty());
     }
+    
     /**
      * Update instance restrictions
      * Updates the restriction settings of an instance
@@ -455,18 +534,23 @@ public com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRespons
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsResponse updateRestrictions(
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRequestBody> request) throws Exception {
+    public UpdateInstanceRestrictionsResponse updateRestrictions(
+            Optional<? extends UpdateInstanceRestrictionsRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/instance/restrictions");
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends UpdateInstanceRestrictionsRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -479,7 +563,10 @@ public com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRespons
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateInstanceRestrictions", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateInstanceRestrictions", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -487,18 +574,28 @@ public com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRespons
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateInstanceRestrictions", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateInstanceRestrictions",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateInstanceRestrictions", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateInstanceRestrictions",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateInstanceRestrictions", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateInstanceRestrictions",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -506,42 +603,42 @@ public com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRespons
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsResponse
+        UpdateInstanceRestrictionsResponse.Builder _resBuilder = 
+            UpdateInstanceRestrictionsResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsResponse _res = _resBuilder.build();
+        UpdateInstanceRestrictionsResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.InstanceRestrictions _out = Utils.mapper().readValue(
+                InstanceRestrictions _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.InstanceRestrictions>() {});
-                _res.withInstanceRestrictions(java.util.Optional.ofNullable(_out));
+                    new TypeReference<InstanceRestrictions>() {});
+                _res.withInstanceRestrictions(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -550,13 +647,13 @@ public com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRespons
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -570,8 +667,8 @@ public com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRespons
      * WARNING: Changing your domain will invalidate all current user sessions (i.e. users will be logged out). Also, while your application is being deployed, a small downtime is expected to occur.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRequestBuilder changeProductionDomain() {
-        return new com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRequestBuilder(this);
+    public ChangeProductionInstanceDomainRequestBuilder changeProductionDomain() {
+        return new ChangeProductionInstanceDomainRequestBuilder(this);
     }
 
     /**
@@ -584,9 +681,10 @@ public com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainReq
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainResponse changeProductionDomainDirect() throws Exception {
+    public ChangeProductionInstanceDomainResponse changeProductionDomainDirect() throws Exception {
         return changeProductionDomain(Optional.empty());
     }
+    
     /**
      * Update production instance domain
      * Change the domain of a production instance.
@@ -598,18 +696,23 @@ public com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRes
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainResponse changeProductionDomain(
-            Optional<? extends com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRequestBody> request) throws Exception {
+    public ChangeProductionInstanceDomainResponse changeProductionDomain(
+            Optional<? extends ChangeProductionInstanceDomainRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/instance/change_domain");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends ChangeProductionInstanceDomainRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -622,7 +725,10 @@ public com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRes
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("ChangeProductionInstanceDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "ChangeProductionInstanceDomain", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -630,18 +736,28 @@ public com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRes
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("ChangeProductionInstanceDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "ChangeProductionInstanceDomain",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("ChangeProductionInstanceDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "ChangeProductionInstanceDomain",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("ChangeProductionInstanceDomain", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "ChangeProductionInstanceDomain",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -649,14 +765,14 @@ public com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRes
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainResponse
+        ChangeProductionInstanceDomainResponse.Builder _resBuilder = 
+            ChangeProductionInstanceDomainResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainResponse _res = _resBuilder.build();
+        ChangeProductionInstanceDomainResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "202")) {
             // no content 
@@ -664,16 +780,16 @@ public com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRes
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -682,13 +798,13 @@ public com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRes
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -698,8 +814,8 @@ public com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRes
      * Updates the organization settings of the instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsRequestBuilder updateOrganizationSettings() {
-        return new com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsRequestBuilder(this);
+    public UpdateInstanceOrganizationSettingsRequestBuilder updateOrganizationSettings() {
+        return new UpdateInstanceOrganizationSettingsRequestBuilder(this);
     }
 
     /**
@@ -708,9 +824,10 @@ public com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSetting
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsResponse updateOrganizationSettingsDirect() throws Exception {
+    public UpdateInstanceOrganizationSettingsResponse updateOrganizationSettingsDirect() throws Exception {
         return updateOrganizationSettings(Optional.empty());
     }
+    
     /**
      * Update instance organization settings
      * Updates the organization settings of the instance
@@ -718,18 +835,23 @@ public com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSetting
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsResponse updateOrganizationSettings(
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsRequestBody> request) throws Exception {
+    public UpdateInstanceOrganizationSettingsResponse updateOrganizationSettings(
+            Optional<? extends UpdateInstanceOrganizationSettingsRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/instance/organization_settings");
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends UpdateInstanceOrganizationSettingsRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -742,7 +864,10 @@ public com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSetting
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateInstanceOrganizationSettings", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateInstanceOrganizationSettings", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -750,18 +875,28 @@ public com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSetting
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateInstanceOrganizationSettings", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateInstanceOrganizationSettings",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateInstanceOrganizationSettings", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateInstanceOrganizationSettings",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateInstanceOrganizationSettings", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateInstanceOrganizationSettings",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -769,42 +904,42 @@ public com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSetting
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsResponse
+        UpdateInstanceOrganizationSettingsResponse.Builder _resBuilder = 
+            UpdateInstanceOrganizationSettingsResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsResponse _res = _resBuilder.build();
+        UpdateInstanceOrganizationSettingsResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.OrganizationSettings _out = Utils.mapper().readValue(
+                OrganizationSettings _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.OrganizationSettings>() {});
-                _res.withOrganizationSettings(java.util.Optional.ofNullable(_out));
+                    new TypeReference<OrganizationSettings>() {});
+                _res.withOrganizationSettings(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -813,13 +948,13 @@ public com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSetting
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/Invitations.java b/src/main/java/com/clerk/backend_api/Invitations.java
index a0a4c7b..3030982 100644
--- a/src/main/java/com/clerk/backend_api/Invitations.java
+++ b/src/main/java/com/clerk/backend_api/Invitations.java
@@ -4,32 +4,43 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.Invitation;
+import com.clerk.backend_api.models.components.InvitationRevoked;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateInvitationRequestBody;
+import com.clerk.backend_api.models.operations.CreateInvitationRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateInvitationResponse;
+import com.clerk.backend_api.models.operations.ListInvitationsRequest;
+import com.clerk.backend_api.models.operations.ListInvitationsRequestBuilder;
+import com.clerk.backend_api.models.operations.ListInvitationsResponse;
+import com.clerk.backend_api.models.operations.QueryParamStatus;
+import com.clerk.backend_api.models.operations.RevokeInvitationRequest;
+import com.clerk.backend_api.models.operations.RevokeInvitationRequestBuilder;
+import com.clerk.backend_api.models.operations.RevokeInvitationResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.ReadContext;
 import java.io.InputStream;
+import java.lang.Exception;
 import java.lang.Long;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Object;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.Optional;
-import org.apache.http.NameValuePair;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.Optional; 
 
 public class Invitations implements
             MethodCallCreateInvitation,
@@ -50,8 +61,8 @@ public class Invitations implements
      * Also, trying to create an invitation for an email address that already exists in your application will result to an error.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateInvitationRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreateInvitationRequestBuilder(this);
+    public CreateInvitationRequestBuilder create() {
+        return new CreateInvitationRequestBuilder(this);
     }
 
     /**
@@ -62,9 +73,10 @@ public com.clerk.backend_api.models.operations.CreateInvitationRequestBuilder cr
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateInvitationResponse createDirect() throws Exception {
+    public CreateInvitationResponse createDirect() throws Exception {
         return create(Optional.empty());
     }
+    
     /**
      * Create an invitation
      * Creates a new invitation for the given email address and sends the invitation email.
@@ -74,18 +86,23 @@ public com.clerk.backend_api.models.operations.CreateInvitationResponse createDi
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateInvitationResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateInvitationRequestBody> request) throws Exception {
+    public CreateInvitationResponse create(
+            Optional<? extends CreateInvitationRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/invitations");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.CreateInvitationRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends CreateInvitationRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -98,7 +115,10 @@ public com.clerk.backend_api.models.operations.CreateInvitationResponse create(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateInvitation", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -106,18 +126,28 @@ public com.clerk.backend_api.models.operations.CreateInvitationResponse create(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateInvitation",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateInvitation",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateInvitation",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -125,42 +155,42 @@ public com.clerk.backend_api.models.operations.CreateInvitationResponse create(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateInvitationResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateInvitationResponse
+        CreateInvitationResponse.Builder _resBuilder = 
+            CreateInvitationResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateInvitationResponse _res = _resBuilder.build();
+        CreateInvitationResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Invitation _out = Utils.mapper().readValue(
+                Invitation _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Invitation>() {});
-                _res.withInvitation(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Invitation>() {});
+                _res.withInvitation(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -169,13 +199,13 @@ public com.clerk.backend_api.models.operations.CreateInvitationResponse create(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -185,8 +215,8 @@ public com.clerk.backend_api.models.operations.CreateInvitationResponse create(
      * Returns all non-revoked invitations for your application, sorted by creation date
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.ListInvitationsRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.ListInvitationsRequestBuilder(this);
+    public ListInvitationsRequestBuilder list() {
+        return new ListInvitationsRequestBuilder(this);
     }
 
     /**
@@ -195,9 +225,10 @@ public com.clerk.backend_api.models.operations.ListInvitationsRequestBuilder lis
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListInvitationsResponse listDirect() throws Exception {
+    public ListInvitationsResponse listDirect() throws Exception {
         return list(Optional.empty(), Optional.empty(), Optional.empty());
     }
+    
     /**
      * List all invitations
      * Returns all non-revoked invitations for your application, sorted by creation date
@@ -210,12 +241,12 @@ public com.clerk.backend_api.models.operations.ListInvitationsResponse listDirec
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListInvitationsResponse list(
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset,
-            Optional<? extends com.clerk.backend_api.models.operations.QueryParamStatus> status) throws Exception {
-        com.clerk.backend_api.models.operations.ListInvitationsRequest request =
-            com.clerk.backend_api.models.operations.ListInvitationsRequest
+    public ListInvitationsResponse list(
+            Optional<Long> limit,
+            Optional<Long> offset,
+            Optional<? extends QueryParamStatus> status) throws Exception {
+        ListInvitationsRequest request =
+            ListInvitationsRequest
                 .builder()
                 .limit(limit)
                 .offset(offset)
@@ -233,7 +264,7 @@ public com.clerk.backend_api.models.operations.ListInvitationsResponse list(
                 this.sdkConfiguration.userAgent);
 
         _req.addQueryParams(Utils.getQueryParams(
-                com.clerk.backend_api.models.operations.ListInvitationsRequest.class,
+                ListInvitationsRequest.class,
                 request, 
                 null));
 
@@ -244,7 +275,10 @@ public com.clerk.backend_api.models.operations.ListInvitationsResponse list(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("ListInvitations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "ListInvitations", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -252,18 +286,28 @@ public com.clerk.backend_api.models.operations.ListInvitationsResponse list(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("ListInvitations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "ListInvitations",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("ListInvitations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "ListInvitations",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("ListInvitations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "ListInvitations",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -271,11 +315,11 @@ public com.clerk.backend_api.models.operations.ListInvitationsResponse list(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        byte[] _fullResponse = Utils.toByteArrayAndClose(_httpRes.body());
+        byte[] _fullResponse = Utils.extractByteArrayFromBody(_httpRes);
         
         @SuppressWarnings("deprecation")
-        com.clerk.backend_api.models.operations.ListInvitationsResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.ListInvitationsResponse
+        ListInvitationsResponse.Builder _resBuilder = 
+            ListInvitationsResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
@@ -298,22 +342,22 @@ public com.clerk.backend_api.models.operations.ListInvitationsResponse list(
                     if (_firstResult.size() < _resolvedLimit) {
                         return Optional.empty();
                     };
-                    long _newOffset = _requestOffset + _firstResult.size();
-                    com.clerk.backend_api.models.operations.ListInvitationsRequestBuilder _ret = list();
+                    long _newOffset = _requestOffset + _firstResult.size(); 
+                    ListInvitationsRequestBuilder _ret = list();
                     _ret.limit(_resolvedLimit);
                     _ret.offset(_newOffset);
                     _ret.status(status);
                     return Optional.of(_ret.call());
                 });
 
-        com.clerk.backend_api.models.operations.ListInvitationsResponse _res = _resBuilder.build();
+        ListInvitationsResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                java.util.List<com.clerk.backend_api.models.components.Invitation> _out = Utils.mapper().readValue(
+                List<Invitation> _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
-                    new TypeReference<java.util.List<com.clerk.backend_api.models.components.Invitation>>() {});
-                _res.withInvitationList(java.util.Optional.ofNullable(_out));
+                    new TypeReference<List<Invitation>>() {});
+                _res.withInvitationList(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
@@ -348,8 +392,8 @@ public com.clerk.backend_api.models.operations.ListInvitationsResponse list(
      * Only active (i.e. non-revoked) invitations can be revoked.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.RevokeInvitationRequestBuilder revoke() {
-        return new com.clerk.backend_api.models.operations.RevokeInvitationRequestBuilder(this);
+    public RevokeInvitationRequestBuilder revoke() {
+        return new RevokeInvitationRequestBuilder(this);
     }
 
     /**
@@ -362,17 +406,17 @@ public com.clerk.backend_api.models.operations.RevokeInvitationRequestBuilder re
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.RevokeInvitationResponse revoke(
+    public RevokeInvitationResponse revoke(
             String invitationId) throws Exception {
-        com.clerk.backend_api.models.operations.RevokeInvitationRequest request =
-            com.clerk.backend_api.models.operations.RevokeInvitationRequest
+        RevokeInvitationRequest request =
+            RevokeInvitationRequest
                 .builder()
                 .invitationId(invitationId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.RevokeInvitationRequest.class,
+                RevokeInvitationRequest.class,
                 _baseUrl,
                 "/invitations/{invitation_id}/revoke",
                 request, null);
@@ -389,7 +433,10 @@ public com.clerk.backend_api.models.operations.RevokeInvitationResponse revoke(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("RevokeInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "RevokeInvitation", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -397,18 +444,28 @@ public com.clerk.backend_api.models.operations.RevokeInvitationResponse revoke(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("RevokeInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "RevokeInvitation",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("RevokeInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "RevokeInvitation",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("RevokeInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "RevokeInvitation",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -416,42 +473,42 @@ public com.clerk.backend_api.models.operations.RevokeInvitationResponse revoke(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.RevokeInvitationResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.RevokeInvitationResponse
+        RevokeInvitationResponse.Builder _resBuilder = 
+            RevokeInvitationResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.RevokeInvitationResponse _res = _resBuilder.build();
+        RevokeInvitationResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.InvitationRevoked _out = Utils.mapper().readValue(
+                InvitationRevoked _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.InvitationRevoked>() {});
-                _res.withInvitationRevoked(java.util.Optional.ofNullable(_out));
+                    new TypeReference<InvitationRevoked>() {});
+                _res.withInvitationRevoked(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -460,13 +517,13 @@ public com.clerk.backend_api.models.operations.RevokeInvitationResponse revoke(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/Jwks.java b/src/main/java/com/clerk/backend_api/Jwks.java
index 3e6de3f..a9241f2 100644
--- a/src/main/java/com/clerk/backend_api/Jwks.java
+++ b/src/main/java/com/clerk/backend_api/Jwks.java
@@ -5,22 +5,22 @@
 package com.clerk.backend_api;
 
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetJWKSRequestBuilder;
+import com.clerk.backend_api.models.operations.GetJWKSResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class Jwks implements
             MethodCallGetJWKS {
@@ -37,8 +37,8 @@ public class Jwks implements
      * Retrieve the JSON Web Key Set of the instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetJWKSRequestBuilder getJWKS() {
-        return new com.clerk.backend_api.models.operations.GetJWKSRequestBuilder(this);
+    public GetJWKSRequestBuilder getJWKS() {
+        return new GetJWKSRequestBuilder(this);
     }
 
     /**
@@ -47,7 +47,7 @@ public com.clerk.backend_api.models.operations.GetJWKSRequestBuilder getJWKS() {
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetJWKSResponse getJWKSDirect() throws Exception {
+    public GetJWKSResponse getJWKSDirect() throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
@@ -65,7 +65,10 @@ public com.clerk.backend_api.models.operations.GetJWKSResponse getJWKSDirect() t
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetJWKS", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetJWKS", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -73,18 +76,28 @@ public com.clerk.backend_api.models.operations.GetJWKSResponse getJWKSDirect() t
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetJWKS", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetJWKS",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetJWKS", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetJWKS",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetJWKS", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetJWKS",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -92,14 +105,14 @@ public com.clerk.backend_api.models.operations.GetJWKSResponse getJWKSDirect() t
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetJWKSResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetJWKSResponse
+        GetJWKSResponse.Builder _resBuilder = 
+            GetJWKSResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetJWKSResponse _res = _resBuilder.build();
+        GetJWKSResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             // no content 
@@ -111,13 +124,13 @@ public com.clerk.backend_api.models.operations.GetJWKSResponse getJWKSDirect() t
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/JwtTemplates.java b/src/main/java/com/clerk/backend_api/JwtTemplates.java
index 1904804..5033369 100644
--- a/src/main/java/com/clerk/backend_api/JwtTemplates.java
+++ b/src/main/java/com/clerk/backend_api/JwtTemplates.java
@@ -4,27 +4,43 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.models.components.JWTTemplate;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateJWTTemplateRequestBody;
+import com.clerk.backend_api.models.operations.CreateJWTTemplateRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateJWTTemplateResponse;
+import com.clerk.backend_api.models.operations.DeleteJWTTemplateRequest;
+import com.clerk.backend_api.models.operations.DeleteJWTTemplateRequestBuilder;
+import com.clerk.backend_api.models.operations.DeleteJWTTemplateResponse;
+import com.clerk.backend_api.models.operations.GetJWTTemplateRequest;
+import com.clerk.backend_api.models.operations.GetJWTTemplateRequestBuilder;
+import com.clerk.backend_api.models.operations.GetJWTTemplateResponse;
+import com.clerk.backend_api.models.operations.ListJWTTemplatesRequestBuilder;
+import com.clerk.backend_api.models.operations.ListJWTTemplatesResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.UpdateJWTTemplateRequest;
+import com.clerk.backend_api.models.operations.UpdateJWTTemplateRequestBody;
+import com.clerk.backend_api.models.operations.UpdateJWTTemplateRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class JwtTemplates implements
             MethodCallListJWTTemplates,
@@ -44,8 +60,8 @@ public class JwtTemplates implements
      * List all templates
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.ListJWTTemplatesRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.ListJWTTemplatesRequestBuilder(this);
+    public ListJWTTemplatesRequestBuilder list() {
+        return new ListJWTTemplatesRequestBuilder(this);
     }
 
     /**
@@ -53,7 +69,7 @@ public com.clerk.backend_api.models.operations.ListJWTTemplatesRequestBuilder li
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListJWTTemplatesResponse listDirect() throws Exception {
+    public ListJWTTemplatesResponse listDirect() throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
@@ -71,7 +87,10 @@ public com.clerk.backend_api.models.operations.ListJWTTemplatesResponse listDire
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("ListJWTTemplates", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "ListJWTTemplates", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -79,18 +98,28 @@ public com.clerk.backend_api.models.operations.ListJWTTemplatesResponse listDire
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("ListJWTTemplates", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "ListJWTTemplates",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("ListJWTTemplates", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "ListJWTTemplates",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("ListJWTTemplates", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "ListJWTTemplates",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -98,28 +127,28 @@ public com.clerk.backend_api.models.operations.ListJWTTemplatesResponse listDire
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.ListJWTTemplatesResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.ListJWTTemplatesResponse
+        ListJWTTemplatesResponse.Builder _resBuilder = 
+            ListJWTTemplatesResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.ListJWTTemplatesResponse _res = _resBuilder.build();
+        ListJWTTemplatesResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                java.util.List<com.clerk.backend_api.models.components.JWTTemplate> _out = Utils.mapper().readValue(
+                List<JWTTemplate> _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<java.util.List<com.clerk.backend_api.models.components.JWTTemplate>>() {});
-                _res.withJWTTemplateList(java.util.Optional.ofNullable(_out));
+                    new TypeReference<List<JWTTemplate>>() {});
+                _res.withJWTTemplateList(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -128,13 +157,13 @@ public com.clerk.backend_api.models.operations.ListJWTTemplatesResponse listDire
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -144,8 +173,8 @@ public com.clerk.backend_api.models.operations.ListJWTTemplatesResponse listDire
      * Create a new JWT template
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateJWTTemplateRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreateJWTTemplateRequestBuilder(this);
+    public CreateJWTTemplateRequestBuilder create() {
+        return new CreateJWTTemplateRequestBuilder(this);
     }
 
     /**
@@ -154,9 +183,10 @@ public com.clerk.backend_api.models.operations.CreateJWTTemplateRequestBuilder c
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateJWTTemplateResponse createDirect() throws Exception {
+    public CreateJWTTemplateResponse createDirect() throws Exception {
         return create(Optional.empty());
     }
+    
     /**
      * Create a JWT template
      * Create a new JWT template
@@ -164,18 +194,23 @@ public com.clerk.backend_api.models.operations.CreateJWTTemplateResponse createD
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateJWTTemplateResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateJWTTemplateRequestBody> request) throws Exception {
+    public CreateJWTTemplateResponse create(
+            Optional<? extends CreateJWTTemplateRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/jwt_templates");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.CreateJWTTemplateRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends CreateJWTTemplateRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -188,7 +223,10 @@ public com.clerk.backend_api.models.operations.CreateJWTTemplateResponse create(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateJWTTemplate", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -196,18 +234,28 @@ public com.clerk.backend_api.models.operations.CreateJWTTemplateResponse create(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "402", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateJWTTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateJWTTemplate",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateJWTTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -215,42 +263,42 @@ public com.clerk.backend_api.models.operations.CreateJWTTemplateResponse create(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateJWTTemplateResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateJWTTemplateResponse
+        CreateJWTTemplateResponse.Builder _resBuilder = 
+            CreateJWTTemplateResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateJWTTemplateResponse _res = _resBuilder.build();
+        CreateJWTTemplateResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.JWTTemplate _out = Utils.mapper().readValue(
+                JWTTemplate _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.JWTTemplate>() {});
-                _res.withJWTTemplate(java.util.Optional.ofNullable(_out));
+                    new TypeReference<JWTTemplate>() {});
+                _res.withJWTTemplate(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "402", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -259,13 +307,13 @@ public com.clerk.backend_api.models.operations.CreateJWTTemplateResponse create(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -275,8 +323,8 @@ public com.clerk.backend_api.models.operations.CreateJWTTemplateResponse create(
      * Retrieve the details of a given JWT template
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetJWTTemplateRequestBuilder get() {
-        return new com.clerk.backend_api.models.operations.GetJWTTemplateRequestBuilder(this);
+    public GetJWTTemplateRequestBuilder get() {
+        return new GetJWTTemplateRequestBuilder(this);
     }
 
     /**
@@ -286,17 +334,17 @@ public com.clerk.backend_api.models.operations.GetJWTTemplateRequestBuilder get(
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetJWTTemplateResponse get(
+    public GetJWTTemplateResponse get(
             String templateId) throws Exception {
-        com.clerk.backend_api.models.operations.GetJWTTemplateRequest request =
-            com.clerk.backend_api.models.operations.GetJWTTemplateRequest
+        GetJWTTemplateRequest request =
+            GetJWTTemplateRequest
                 .builder()
                 .templateId(templateId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.GetJWTTemplateRequest.class,
+                GetJWTTemplateRequest.class,
                 _baseUrl,
                 "/jwt_templates/{template_id}",
                 request, null);
@@ -313,7 +361,10 @@ public com.clerk.backend_api.models.operations.GetJWTTemplateResponse get(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetJWTTemplate", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -321,18 +372,28 @@ public com.clerk.backend_api.models.operations.GetJWTTemplateResponse get(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetJWTTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetJWTTemplate",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetJWTTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -340,42 +401,42 @@ public com.clerk.backend_api.models.operations.GetJWTTemplateResponse get(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetJWTTemplateResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetJWTTemplateResponse
+        GetJWTTemplateResponse.Builder _resBuilder = 
+            GetJWTTemplateResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetJWTTemplateResponse _res = _resBuilder.build();
+        GetJWTTemplateResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.JWTTemplate _out = Utils.mapper().readValue(
+                JWTTemplate _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.JWTTemplate>() {});
-                _res.withJWTTemplate(java.util.Optional.ofNullable(_out));
+                    new TypeReference<JWTTemplate>() {});
+                _res.withJWTTemplate(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -384,13 +445,13 @@ public com.clerk.backend_api.models.operations.GetJWTTemplateResponse get(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -400,8 +461,8 @@ public com.clerk.backend_api.models.operations.GetJWTTemplateResponse get(
      * Updates an existing JWT template
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateJWTTemplateRequestBuilder update() {
-        return new com.clerk.backend_api.models.operations.UpdateJWTTemplateRequestBuilder(this);
+    public UpdateJWTTemplateRequestBuilder update() {
+        return new UpdateJWTTemplateRequestBuilder(this);
     }
 
     /**
@@ -411,10 +472,11 @@ public com.clerk.backend_api.models.operations.UpdateJWTTemplateRequestBuilder u
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse update(
+    public UpdateJWTTemplateResponse update(
             String templateId) throws Exception {
         return update(templateId, Optional.empty());
     }
+    
     /**
      * Update a JWT template
      * Updates an existing JWT template
@@ -423,11 +485,11 @@ public com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse update(
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse update(
+    public UpdateJWTTemplateResponse update(
             String templateId,
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateJWTTemplateRequestBody> requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.UpdateJWTTemplateRequest request =
-            com.clerk.backend_api.models.operations.UpdateJWTTemplateRequest
+            Optional<? extends UpdateJWTTemplateRequestBody> requestBody) throws Exception {
+        UpdateJWTTemplateRequest request =
+            UpdateJWTTemplateRequest
                 .builder()
                 .templateId(templateId)
                 .requestBody(requestBody)
@@ -435,16 +497,21 @@ public com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse update(
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UpdateJWTTemplateRequest.class,
+                UpdateJWTTemplateRequest.class,
                 _baseUrl,
                 "/jwt_templates/{template_id}",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -457,7 +524,10 @@ public com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse update(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateJWTTemplate", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -465,18 +535,28 @@ public com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse update(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "402", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateJWTTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateJWTTemplate",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateJWTTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -484,42 +564,42 @@ public com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse update(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse
+        UpdateJWTTemplateResponse.Builder _resBuilder = 
+            UpdateJWTTemplateResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse _res = _resBuilder.build();
+        UpdateJWTTemplateResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.JWTTemplate _out = Utils.mapper().readValue(
+                JWTTemplate _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.JWTTemplate>() {});
-                _res.withJWTTemplate(java.util.Optional.ofNullable(_out));
+                    new TypeReference<JWTTemplate>() {});
+                _res.withJWTTemplate(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "402", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -528,13 +608,13 @@ public com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse update(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -543,8 +623,8 @@ public com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse update(
      * Delete a Template
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeleteJWTTemplateRequestBuilder delete() {
-        return new com.clerk.backend_api.models.operations.DeleteJWTTemplateRequestBuilder(this);
+    public DeleteJWTTemplateRequestBuilder delete() {
+        return new DeleteJWTTemplateRequestBuilder(this);
     }
 
     /**
@@ -553,17 +633,17 @@ public com.clerk.backend_api.models.operations.DeleteJWTTemplateRequestBuilder d
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeleteJWTTemplateResponse delete(
+    public DeleteJWTTemplateResponse delete(
             String templateId) throws Exception {
-        com.clerk.backend_api.models.operations.DeleteJWTTemplateRequest request =
-            com.clerk.backend_api.models.operations.DeleteJWTTemplateRequest
+        DeleteJWTTemplateRequest request =
+            DeleteJWTTemplateRequest
                 .builder()
                 .templateId(templateId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DeleteJWTTemplateRequest.class,
+                DeleteJWTTemplateRequest.class,
                 _baseUrl,
                 "/jwt_templates/{template_id}",
                 request, null);
@@ -580,7 +660,10 @@ public com.clerk.backend_api.models.operations.DeleteJWTTemplateResponse delete(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeleteJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeleteJWTTemplate", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -588,18 +671,28 @@ public com.clerk.backend_api.models.operations.DeleteJWTTemplateResponse delete(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeleteJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeleteJWTTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeleteJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeleteJWTTemplate",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeleteJWTTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeleteJWTTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -607,42 +700,42 @@ public com.clerk.backend_api.models.operations.DeleteJWTTemplateResponse delete(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeleteJWTTemplateResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeleteJWTTemplateResponse
+        DeleteJWTTemplateResponse.Builder _resBuilder = 
+            DeleteJWTTemplateResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeleteJWTTemplateResponse _res = _resBuilder.build();
+        DeleteJWTTemplateResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.DeletedObject _out = Utils.mapper().readValue(
+                DeletedObject _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.DeletedObject>() {});
-                _res.withDeletedObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<DeletedObject>() {});
+                _res.withDeletedObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -651,13 +744,13 @@ public com.clerk.backend_api.models.operations.DeleteJWTTemplateResponse delete(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/Miscellaneous.java b/src/main/java/com/clerk/backend_api/Miscellaneous.java
index 3d8ca08..8cdf110 100644
--- a/src/main/java/com/clerk/backend_api/Miscellaneous.java
+++ b/src/main/java/com/clerk/backend_api/Miscellaneous.java
@@ -5,23 +5,23 @@
 package com.clerk.backend_api;
 
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetPublicInterstitialRequest;
+import com.clerk.backend_api.models.operations.GetPublicInterstitialRequestBuilder;
+import com.clerk.backend_api.models.operations.GetPublicInterstitialResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.util.Optional;
-import org.apache.http.NameValuePair;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class Miscellaneous implements
             MethodCallGetPublicInterstitial {
@@ -39,8 +39,8 @@ public class Miscellaneous implements
      * It is used by Clerk SDKs when the user's authentication state cannot be immediately determined.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetPublicInterstitialRequestBuilder getPublicInterstitial() {
-        return new com.clerk.backend_api.models.operations.GetPublicInterstitialRequestBuilder(this);
+    public GetPublicInterstitialRequestBuilder getPublicInterstitial() {
+        return new GetPublicInterstitialRequestBuilder(this);
     }
 
     /**
@@ -50,9 +50,10 @@ public com.clerk.backend_api.models.operations.GetPublicInterstitialRequestBuild
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetPublicInterstitialResponse getPublicInterstitialDirect() throws Exception {
+    public GetPublicInterstitialResponse getPublicInterstitialDirect() throws Exception {
         return getPublicInterstitial(Optional.empty(), Optional.empty());
     }
+    
     /**
      * Returns the markup for the interstitial page
      * The Clerk interstitial endpoint serves an html page that loads clerk.js in order to check the user's authentication state.
@@ -62,11 +63,11 @@ public com.clerk.backend_api.models.operations.GetPublicInterstitialResponse get
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetPublicInterstitialResponse getPublicInterstitial(
-            Optional<? extends String> frontendApi,
-            Optional<? extends String> publishableKey) throws Exception {
-        com.clerk.backend_api.models.operations.GetPublicInterstitialRequest request =
-            com.clerk.backend_api.models.operations.GetPublicInterstitialRequest
+    public GetPublicInterstitialResponse getPublicInterstitial(
+            Optional<String> frontendApi,
+            Optional<String> publishableKey) throws Exception {
+        GetPublicInterstitialRequest request =
+            GetPublicInterstitialRequest
                 .builder()
                 .frontendApi(frontendApi)
                 .publishableKey(publishableKey)
@@ -83,7 +84,7 @@ public com.clerk.backend_api.models.operations.GetPublicInterstitialResponse get
                 this.sdkConfiguration.userAgent);
 
         _req.addQueryParams(Utils.getQueryParams(
-                com.clerk.backend_api.models.operations.GetPublicInterstitialRequest.class,
+                GetPublicInterstitialRequest.class,
                 request, 
                 null));
 
@@ -91,7 +92,10 @@ public com.clerk.backend_api.models.operations.GetPublicInterstitialResponse get
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetPublicInterstitial", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetPublicInterstitial", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -99,18 +103,28 @@ public com.clerk.backend_api.models.operations.GetPublicInterstitialResponse get
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "4XX", "500", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetPublicInterstitial", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetPublicInterstitial",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetPublicInterstitial", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetPublicInterstitial",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetPublicInterstitial", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetPublicInterstitial",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -118,14 +132,14 @@ public com.clerk.backend_api.models.operations.GetPublicInterstitialResponse get
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetPublicInterstitialResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetPublicInterstitialResponse
+        GetPublicInterstitialResponse.Builder _resBuilder = 
+            GetPublicInterstitialResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetPublicInterstitialResponse _res = _resBuilder.build();
+        GetPublicInterstitialResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             // no content 
@@ -137,13 +151,13 @@ public com.clerk.backend_api.models.operations.GetPublicInterstitialResponse get
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/OAuthApplications.java b/src/main/java/com/clerk/backend_api/OAuthApplications.java
index 6ad0e99..ebad850 100644
--- a/src/main/java/com/clerk/backend_api/OAuthApplications.java
+++ b/src/main/java/com/clerk/backend_api/OAuthApplications.java
@@ -4,32 +4,53 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.models.components.OAuthApplication;
+import com.clerk.backend_api.models.components.OAuthApplicationWithSecret;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateOAuthApplicationRequestBody;
+import com.clerk.backend_api.models.operations.CreateOAuthApplicationRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse;
+import com.clerk.backend_api.models.operations.DeleteOAuthApplicationRequest;
+import com.clerk.backend_api.models.operations.DeleteOAuthApplicationRequestBuilder;
+import com.clerk.backend_api.models.operations.DeleteOAuthApplicationResponse;
+import com.clerk.backend_api.models.operations.GetOAuthApplicationRequest;
+import com.clerk.backend_api.models.operations.GetOAuthApplicationRequestBuilder;
+import com.clerk.backend_api.models.operations.GetOAuthApplicationResponse;
+import com.clerk.backend_api.models.operations.ListOAuthApplicationsRequest;
+import com.clerk.backend_api.models.operations.ListOAuthApplicationsRequestBuilder;
+import com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse;
+import com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretRequest;
+import com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretRequestBuilder;
+import com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequest;
+import com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequestBody;
+import com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateOAuthApplicationResponse;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.ReadContext;
 import java.io.InputStream;
+import java.lang.Exception;
 import java.lang.Long;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Object;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.Optional;
-import org.apache.http.NameValuePair;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.Optional; 
 
 public class OAuthApplications implements
             MethodCallListOAuthApplications,
@@ -54,8 +75,8 @@ public class OAuthApplications implements
      * Most recent OAuth applications will be returned first.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.ListOAuthApplicationsRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.ListOAuthApplicationsRequestBuilder(this);
+    public ListOAuthApplicationsRequestBuilder list() {
+        return new ListOAuthApplicationsRequestBuilder(this);
     }
 
     /**
@@ -67,9 +88,10 @@ public com.clerk.backend_api.models.operations.ListOAuthApplicationsRequestBuild
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse listDirect() throws Exception {
+    public ListOAuthApplicationsResponse listDirect() throws Exception {
         return list(Optional.empty(), Optional.empty());
     }
+    
     /**
      * Get a list of OAuth applications for an instance
      * This request returns the list of OAuth applications for an instance.
@@ -84,11 +106,11 @@ public com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse lis
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse list(
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) throws Exception {
-        com.clerk.backend_api.models.operations.ListOAuthApplicationsRequest request =
-            com.clerk.backend_api.models.operations.ListOAuthApplicationsRequest
+    public ListOAuthApplicationsResponse list(
+            Optional<Long> limit,
+            Optional<Long> offset) throws Exception {
+        ListOAuthApplicationsRequest request =
+            ListOAuthApplicationsRequest
                 .builder()
                 .limit(limit)
                 .offset(offset)
@@ -105,7 +127,7 @@ public com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse lis
                 this.sdkConfiguration.userAgent);
 
         _req.addQueryParams(Utils.getQueryParams(
-                com.clerk.backend_api.models.operations.ListOAuthApplicationsRequest.class,
+                ListOAuthApplicationsRequest.class,
                 request, 
                 null));
 
@@ -116,7 +138,10 @@ public com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse lis
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("ListOAuthApplications", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "ListOAuthApplications", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -124,18 +149,28 @@ public com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse lis
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("ListOAuthApplications", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "ListOAuthApplications",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("ListOAuthApplications", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "ListOAuthApplications",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("ListOAuthApplications", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "ListOAuthApplications",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -143,11 +178,11 @@ public com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse lis
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        byte[] _fullResponse = Utils.toByteArrayAndClose(_httpRes.body());
+        byte[] _fullResponse = Utils.extractByteArrayFromBody(_httpRes);
         
         @SuppressWarnings("deprecation")
-        com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse
+        ListOAuthApplicationsResponse.Builder _resBuilder = 
+            ListOAuthApplicationsResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
@@ -170,21 +205,21 @@ public com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse lis
                     if (_firstResult.size() < _resolvedLimit) {
                         return Optional.empty();
                     };
-                    long _newOffset = _requestOffset + _firstResult.size();
-                    com.clerk.backend_api.models.operations.ListOAuthApplicationsRequestBuilder _ret = list();
+                    long _newOffset = _requestOffset + _firstResult.size(); 
+                    ListOAuthApplicationsRequestBuilder _ret = list();
                     _ret.limit(_resolvedLimit);
                     _ret.offset(_newOffset);
                     return Optional.of(_ret.call());
                 });
 
-        com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse _res = _resBuilder.build();
+        ListOAuthApplicationsResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
                 com.clerk.backend_api.models.components.OAuthApplications _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
                     new TypeReference<com.clerk.backend_api.models.components.OAuthApplications>() {});
-                _res.withOAuthApplications(java.util.Optional.ofNullable(_out));
+                _res.withOAuthApplications(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
@@ -196,9 +231,9 @@ public com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse lis
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
@@ -232,8 +267,8 @@ public com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse lis
      * All URL schemes are allowed such as `http://`, `https://`, `myapp://`, etc...
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateOAuthApplicationRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreateOAuthApplicationRequestBuilder(this);
+    public CreateOAuthApplicationRequestBuilder create() {
+        return new CreateOAuthApplicationRequestBuilder(this);
     }
 
     /**
@@ -244,9 +279,10 @@ public com.clerk.backend_api.models.operations.CreateOAuthApplicationRequestBuil
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse createDirect() throws Exception {
+    public CreateOAuthApplicationResponse createDirect() throws Exception {
         return create(Optional.empty());
     }
+    
     /**
      * Create an OAuth application
      * Creates a new OAuth application with the given name and callback URL for an instance.
@@ -256,18 +292,23 @@ public com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse cr
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateOAuthApplicationRequestBody> request) throws Exception {
+    public CreateOAuthApplicationResponse create(
+            Optional<? extends CreateOAuthApplicationRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/oauth_applications");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.CreateOAuthApplicationRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends CreateOAuthApplicationRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -280,7 +321,10 @@ public com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse cr
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateOAuthApplication", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -288,18 +332,28 @@ public com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse cr
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateOAuthApplication",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateOAuthApplication",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateOAuthApplication",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -307,42 +361,42 @@ public com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse cr
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse
+        CreateOAuthApplicationResponse.Builder _resBuilder = 
+            CreateOAuthApplicationResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse _res = _resBuilder.build();
+        CreateOAuthApplicationResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.OAuthApplicationWithSecret _out = Utils.mapper().readValue(
+                OAuthApplicationWithSecret _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.OAuthApplicationWithSecret>() {});
-                _res.withOAuthApplicationWithSecret(java.util.Optional.ofNullable(_out));
+                    new TypeReference<OAuthApplicationWithSecret>() {});
+                _res.withOAuthApplicationWithSecret(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -351,13 +405,13 @@ public com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse cr
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -367,8 +421,8 @@ public com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse cr
      * Fetches the OAuth application whose ID matches the provided `id` in the path.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetOAuthApplicationRequestBuilder get() {
-        return new com.clerk.backend_api.models.operations.GetOAuthApplicationRequestBuilder(this);
+    public GetOAuthApplicationRequestBuilder get() {
+        return new GetOAuthApplicationRequestBuilder(this);
     }
 
     /**
@@ -378,17 +432,17 @@ public com.clerk.backend_api.models.operations.GetOAuthApplicationRequestBuilder
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetOAuthApplicationResponse get(
+    public GetOAuthApplicationResponse get(
             String oauthApplicationId) throws Exception {
-        com.clerk.backend_api.models.operations.GetOAuthApplicationRequest request =
-            com.clerk.backend_api.models.operations.GetOAuthApplicationRequest
+        GetOAuthApplicationRequest request =
+            GetOAuthApplicationRequest
                 .builder()
                 .oauthApplicationId(oauthApplicationId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.GetOAuthApplicationRequest.class,
+                GetOAuthApplicationRequest.class,
                 _baseUrl,
                 "/oauth_applications/{oauth_application_id}",
                 request, null);
@@ -405,7 +459,10 @@ public com.clerk.backend_api.models.operations.GetOAuthApplicationResponse get(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetOAuthApplication", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -413,18 +470,28 @@ public com.clerk.backend_api.models.operations.GetOAuthApplicationResponse get(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetOAuthApplication",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetOAuthApplication",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetOAuthApplication",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -432,42 +499,42 @@ public com.clerk.backend_api.models.operations.GetOAuthApplicationResponse get(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetOAuthApplicationResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetOAuthApplicationResponse
+        GetOAuthApplicationResponse.Builder _resBuilder = 
+            GetOAuthApplicationResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetOAuthApplicationResponse _res = _resBuilder.build();
+        GetOAuthApplicationResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.OAuthApplication _out = Utils.mapper().readValue(
+                OAuthApplication _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.OAuthApplication>() {});
-                _res.withOAuthApplication(java.util.Optional.ofNullable(_out));
+                    new TypeReference<OAuthApplication>() {});
+                _res.withOAuthApplication(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -476,13 +543,13 @@ public com.clerk.backend_api.models.operations.GetOAuthApplicationResponse get(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -492,8 +559,8 @@ public com.clerk.backend_api.models.operations.GetOAuthApplicationResponse get(
      * Updates an existing OAuth application
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequestBuilder updateApplication() {
-        return new com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequestBuilder(this);
+    public UpdateOAuthApplicationRequestBuilder updateApplication() {
+        return new UpdateOAuthApplicationRequestBuilder(this);
     }
 
     /**
@@ -504,11 +571,11 @@ public com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequestBuil
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateOAuthApplicationResponse updateApplication(
+    public UpdateOAuthApplicationResponse updateApplication(
             String oauthApplicationId,
-            com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequestBody requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequest request =
-            com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequest
+            UpdateOAuthApplicationRequestBody requestBody) throws Exception {
+        UpdateOAuthApplicationRequest request =
+            UpdateOAuthApplicationRequest
                 .builder()
                 .oauthApplicationId(oauthApplicationId)
                 .requestBody(requestBody)
@@ -516,16 +583,21 @@ public com.clerk.backend_api.models.operations.UpdateOAuthApplicationResponse up
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequest.class,
+                UpdateOAuthApplicationRequest.class,
                 _baseUrl,
                 "/oauth_applications/{oauth_application_id}",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         if (_serializedRequestBody == null) {
             throw new Exception("Request body is required");
         }
@@ -541,7 +613,10 @@ public com.clerk.backend_api.models.operations.UpdateOAuthApplicationResponse up
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateOAuthApplication", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -549,18 +624,28 @@ public com.clerk.backend_api.models.operations.UpdateOAuthApplicationResponse up
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateOAuthApplication",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateOAuthApplication",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateOAuthApplication",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -568,42 +653,42 @@ public com.clerk.backend_api.models.operations.UpdateOAuthApplicationResponse up
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateOAuthApplicationResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateOAuthApplicationResponse
+        UpdateOAuthApplicationResponse.Builder _resBuilder = 
+            UpdateOAuthApplicationResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateOAuthApplicationResponse _res = _resBuilder.build();
+        UpdateOAuthApplicationResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.OAuthApplication _out = Utils.mapper().readValue(
+                OAuthApplication _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.OAuthApplication>() {});
-                _res.withOAuthApplication(java.util.Optional.ofNullable(_out));
+                    new TypeReference<OAuthApplication>() {});
+                _res.withOAuthApplication(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -612,13 +697,13 @@ public com.clerk.backend_api.models.operations.UpdateOAuthApplicationResponse up
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -629,8 +714,8 @@ public com.clerk.backend_api.models.operations.UpdateOAuthApplicationResponse up
      * This is not reversible.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeleteOAuthApplicationRequestBuilder delete() {
-        return new com.clerk.backend_api.models.operations.DeleteOAuthApplicationRequestBuilder(this);
+    public DeleteOAuthApplicationRequestBuilder delete() {
+        return new DeleteOAuthApplicationRequestBuilder(this);
     }
 
     /**
@@ -641,17 +726,17 @@ public com.clerk.backend_api.models.operations.DeleteOAuthApplicationRequestBuil
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeleteOAuthApplicationResponse delete(
+    public DeleteOAuthApplicationResponse delete(
             String oauthApplicationId) throws Exception {
-        com.clerk.backend_api.models.operations.DeleteOAuthApplicationRequest request =
-            com.clerk.backend_api.models.operations.DeleteOAuthApplicationRequest
+        DeleteOAuthApplicationRequest request =
+            DeleteOAuthApplicationRequest
                 .builder()
                 .oauthApplicationId(oauthApplicationId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DeleteOAuthApplicationRequest.class,
+                DeleteOAuthApplicationRequest.class,
                 _baseUrl,
                 "/oauth_applications/{oauth_application_id}",
                 request, null);
@@ -668,7 +753,10 @@ public com.clerk.backend_api.models.operations.DeleteOAuthApplicationResponse de
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeleteOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeleteOAuthApplication", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -676,18 +764,28 @@ public com.clerk.backend_api.models.operations.DeleteOAuthApplicationResponse de
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeleteOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeleteOAuthApplication",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeleteOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeleteOAuthApplication",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeleteOAuthApplication", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeleteOAuthApplication",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -695,42 +793,42 @@ public com.clerk.backend_api.models.operations.DeleteOAuthApplicationResponse de
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeleteOAuthApplicationResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeleteOAuthApplicationResponse
+        DeleteOAuthApplicationResponse.Builder _resBuilder = 
+            DeleteOAuthApplicationResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeleteOAuthApplicationResponse _res = _resBuilder.build();
+        DeleteOAuthApplicationResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.DeletedObject _out = Utils.mapper().readValue(
+                DeletedObject _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.DeletedObject>() {});
-                _res.withDeletedObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<DeletedObject>() {});
+                _res.withDeletedObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -739,13 +837,13 @@ public com.clerk.backend_api.models.operations.DeleteOAuthApplicationResponse de
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -756,8 +854,8 @@ public com.clerk.backend_api.models.operations.DeleteOAuthApplicationResponse de
      * When the client secret is rotated, make sure to update it in authorized OAuth clients.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretRequestBuilder rotateSecret() {
-        return new com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretRequestBuilder(this);
+    public RotateOAuthApplicationSecretRequestBuilder rotateSecret() {
+        return new RotateOAuthApplicationSecretRequestBuilder(this);
     }
 
     /**
@@ -768,17 +866,17 @@ public com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretReque
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretResponse rotateSecret(
+    public RotateOAuthApplicationSecretResponse rotateSecret(
             String oauthApplicationId) throws Exception {
-        com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretRequest request =
-            com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretRequest
+        RotateOAuthApplicationSecretRequest request =
+            RotateOAuthApplicationSecretRequest
                 .builder()
                 .oauthApplicationId(oauthApplicationId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretRequest.class,
+                RotateOAuthApplicationSecretRequest.class,
                 _baseUrl,
                 "/oauth_applications/{oauth_application_id}/rotate_secret",
                 request, null);
@@ -795,7 +893,10 @@ public com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretRespo
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("RotateOAuthApplicationSecret", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "RotateOAuthApplicationSecret", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -803,18 +904,28 @@ public com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretRespo
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("RotateOAuthApplicationSecret", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "RotateOAuthApplicationSecret",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("RotateOAuthApplicationSecret", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "RotateOAuthApplicationSecret",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("RotateOAuthApplicationSecret", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "RotateOAuthApplicationSecret",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -822,42 +933,42 @@ public com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretRespo
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretResponse
+        RotateOAuthApplicationSecretResponse.Builder _resBuilder = 
+            RotateOAuthApplicationSecretResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretResponse _res = _resBuilder.build();
+        RotateOAuthApplicationSecretResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.OAuthApplicationWithSecret _out = Utils.mapper().readValue(
+                OAuthApplicationWithSecret _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.OAuthApplicationWithSecret>() {});
-                _res.withOAuthApplicationWithSecret(java.util.Optional.ofNullable(_out));
+                    new TypeReference<OAuthApplicationWithSecret>() {});
+                _res.withOAuthApplicationWithSecret(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -866,13 +977,13 @@ public com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretRespo
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/OrganizationInvitations.java b/src/main/java/com/clerk/backend_api/OrganizationInvitations.java
index 3d090fd..60b00e2 100644
--- a/src/main/java/com/clerk/backend_api/OrganizationInvitations.java
+++ b/src/main/java/com/clerk/backend_api/OrganizationInvitations.java
@@ -4,32 +4,55 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.OrganizationInvitation;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkRequest;
+import com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkResponse;
+import com.clerk.backend_api.models.operations.CreateOrganizationInvitationRequest;
+import com.clerk.backend_api.models.operations.CreateOrganizationInvitationRequestBody;
+import com.clerk.backend_api.models.operations.CreateOrganizationInvitationRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateOrganizationInvitationResponse;
+import com.clerk.backend_api.models.operations.GetOrganizationInvitationRequest;
+import com.clerk.backend_api.models.operations.GetOrganizationInvitationRequestBuilder;
+import com.clerk.backend_api.models.operations.GetOrganizationInvitationResponse;
+import com.clerk.backend_api.models.operations.ListOrganizationInvitationsQueryParamStatus;
+import com.clerk.backend_api.models.operations.ListOrganizationInvitationsRequest;
+import com.clerk.backend_api.models.operations.ListOrganizationInvitationsRequestBuilder;
+import com.clerk.backend_api.models.operations.ListOrganizationInvitationsResponse;
+import com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsRequest;
+import com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsRequestBuilder;
+import com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsResponse;
+import com.clerk.backend_api.models.operations.RequestBody;
+import com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRequest;
+import com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRequestBody;
+import com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRequestBuilder;
+import com.clerk.backend_api.models.operations.RevokeOrganizationInvitationResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.ReadContext;
 import java.io.InputStream;
+import java.lang.Deprecated;
+import java.lang.Exception;
 import java.lang.Long;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Object;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.Optional;
-import org.apache.http.NameValuePair;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.Optional; 
 
 public class OrganizationInvitations implements
             MethodCallCreateOrganizationInvitation,
@@ -66,8 +89,8 @@ public class OrganizationInvitations implements
      * When the organization invitation is accepted, the metadata will be transferred to the newly created organization membership.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateOrganizationInvitationRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreateOrganizationInvitationRequestBuilder(this);
+    public CreateOrganizationInvitationRequestBuilder create() {
+        return new CreateOrganizationInvitationRequestBuilder(this);
     }
 
     /**
@@ -93,11 +116,11 @@ public com.clerk.backend_api.models.operations.CreateOrganizationInvitationReque
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateOrganizationInvitationResponse create(
+    public CreateOrganizationInvitationResponse create(
             String organizationId,
-            com.clerk.backend_api.models.operations.CreateOrganizationInvitationRequestBody requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.CreateOrganizationInvitationRequest request =
-            com.clerk.backend_api.models.operations.CreateOrganizationInvitationRequest
+            CreateOrganizationInvitationRequestBody requestBody) throws Exception {
+        CreateOrganizationInvitationRequest request =
+            CreateOrganizationInvitationRequest
                 .builder()
                 .organizationId(organizationId)
                 .requestBody(requestBody)
@@ -105,16 +128,21 @@ public com.clerk.backend_api.models.operations.CreateOrganizationInvitationRespo
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.CreateOrganizationInvitationRequest.class,
+                CreateOrganizationInvitationRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}/invitations",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         if (_serializedRequestBody == null) {
             throw new Exception("Request body is required");
         }
@@ -130,7 +158,10 @@ public com.clerk.backend_api.models.operations.CreateOrganizationInvitationRespo
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateOrganizationInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateOrganizationInvitation", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -138,18 +169,28 @@ public com.clerk.backend_api.models.operations.CreateOrganizationInvitationRespo
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateOrganizationInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateOrganizationInvitation",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateOrganizationInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateOrganizationInvitation",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateOrganizationInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateOrganizationInvitation",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -157,42 +198,42 @@ public com.clerk.backend_api.models.operations.CreateOrganizationInvitationRespo
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateOrganizationInvitationResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateOrganizationInvitationResponse
+        CreateOrganizationInvitationResponse.Builder _resBuilder = 
+            CreateOrganizationInvitationResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateOrganizationInvitationResponse _res = _resBuilder.build();
+        CreateOrganizationInvitationResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.OrganizationInvitation _out = Utils.mapper().readValue(
+                OrganizationInvitation _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.OrganizationInvitation>() {});
-                _res.withOrganizationInvitation(java.util.Optional.ofNullable(_out));
+                    new TypeReference<OrganizationInvitation>() {});
+                _res.withOrganizationInvitation(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -201,13 +242,13 @@ public com.clerk.backend_api.models.operations.CreateOrganizationInvitationRespo
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -222,8 +263,8 @@ public com.clerk.backend_api.models.operations.CreateOrganizationInvitationRespo
      * Any invitations created as a result of an Organization Domain are not included in the results.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.ListOrganizationInvitationsRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.ListOrganizationInvitationsRequestBuilder(this);
+    public ListOrganizationInvitationsRequestBuilder list() {
+        return new ListOrganizationInvitationsRequestBuilder(this);
     }
 
     /**
@@ -238,10 +279,11 @@ public com.clerk.backend_api.models.operations.ListOrganizationInvitationsReques
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListOrganizationInvitationsResponse list(
+    public ListOrganizationInvitationsResponse list(
             String organizationId) throws Exception {
         return list(organizationId, Optional.empty(), Optional.empty(), Optional.empty());
     }
+    
     /**
      * Get a list of organization invitations
      * This request returns the list of organization invitations.
@@ -260,13 +302,13 @@ public com.clerk.backend_api.models.operations.ListOrganizationInvitationsRespon
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListOrganizationInvitationsResponse list(
+    public ListOrganizationInvitationsResponse list(
             String organizationId,
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset,
-            Optional<? extends com.clerk.backend_api.models.operations.ListOrganizationInvitationsQueryParamStatus> status) throws Exception {
-        com.clerk.backend_api.models.operations.ListOrganizationInvitationsRequest request =
-            com.clerk.backend_api.models.operations.ListOrganizationInvitationsRequest
+            Optional<Long> limit,
+            Optional<Long> offset,
+            Optional<? extends ListOrganizationInvitationsQueryParamStatus> status) throws Exception {
+        ListOrganizationInvitationsRequest request =
+            ListOrganizationInvitationsRequest
                 .builder()
                 .organizationId(organizationId)
                 .limit(limit)
@@ -276,7 +318,7 @@ public com.clerk.backend_api.models.operations.ListOrganizationInvitationsRespon
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.ListOrganizationInvitationsRequest.class,
+                ListOrganizationInvitationsRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}/invitations",
                 request, null);
@@ -287,7 +329,7 @@ public com.clerk.backend_api.models.operations.ListOrganizationInvitationsRespon
                 this.sdkConfiguration.userAgent);
 
         _req.addQueryParams(Utils.getQueryParams(
-                com.clerk.backend_api.models.operations.ListOrganizationInvitationsRequest.class,
+                ListOrganizationInvitationsRequest.class,
                 request, 
                 null));
 
@@ -298,7 +340,10 @@ public com.clerk.backend_api.models.operations.ListOrganizationInvitationsRespon
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("ListOrganizationInvitations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "ListOrganizationInvitations", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -306,18 +351,28 @@ public com.clerk.backend_api.models.operations.ListOrganizationInvitationsRespon
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("ListOrganizationInvitations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "ListOrganizationInvitations",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("ListOrganizationInvitations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "ListOrganizationInvitations",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("ListOrganizationInvitations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "ListOrganizationInvitations",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -325,11 +380,11 @@ public com.clerk.backend_api.models.operations.ListOrganizationInvitationsRespon
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        byte[] _fullResponse = Utils.toByteArrayAndClose(_httpRes.body());
+        byte[] _fullResponse = Utils.extractByteArrayFromBody(_httpRes);
         
         @SuppressWarnings("deprecation")
-        com.clerk.backend_api.models.operations.ListOrganizationInvitationsResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.ListOrganizationInvitationsResponse
+        ListOrganizationInvitationsResponse.Builder _resBuilder = 
+            ListOrganizationInvitationsResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
@@ -352,8 +407,8 @@ public com.clerk.backend_api.models.operations.ListOrganizationInvitationsRespon
                     if (_firstResult.size() < _resolvedLimit) {
                         return Optional.empty();
                     };
-                    long _newOffset = _requestOffset + _firstResult.size();
-                    com.clerk.backend_api.models.operations.ListOrganizationInvitationsRequestBuilder _ret = list();
+                    long _newOffset = _requestOffset + _firstResult.size(); 
+                    ListOrganizationInvitationsRequestBuilder _ret = list();
                     _ret.organizationId(organizationId);
                     _ret.limit(_resolvedLimit);
                     _ret.offset(_newOffset);
@@ -361,14 +416,14 @@ public com.clerk.backend_api.models.operations.ListOrganizationInvitationsRespon
                     return Optional.of(_ret.call());
                 });
 
-        com.clerk.backend_api.models.operations.ListOrganizationInvitationsResponse _res = _resBuilder.build();
+        ListOrganizationInvitationsResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
                 com.clerk.backend_api.models.components.OrganizationInvitations _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
                     new TypeReference<com.clerk.backend_api.models.components.OrganizationInvitations>() {});
-                _res.withOrganizationInvitations(java.util.Optional.ofNullable(_out));
+                _res.withOrganizationInvitations(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
@@ -380,9 +435,9 @@ public com.clerk.backend_api.models.operations.ListOrganizationInvitationsRespon
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
@@ -426,8 +481,8 @@ public com.clerk.backend_api.models.operations.ListOrganizationInvitationsRespon
      * When the organization invitation is accepted, the metadata will be transferred to the newly created organization membership.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkRequestBuilder createBulk() {
-        return new com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkRequestBuilder(this);
+    public CreateOrganizationInvitationBulkRequestBuilder createBulk() {
+        return new CreateOrganizationInvitationBulkRequestBuilder(this);
     }
 
     /**
@@ -450,11 +505,11 @@ public com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkR
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkResponse createBulk(
+    public CreateOrganizationInvitationBulkResponse createBulk(
             String organizationId,
-            java.util.List<com.clerk.backend_api.models.operations.RequestBody> requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkRequest request =
-            com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkRequest
+            List<RequestBody> requestBody) throws Exception {
+        CreateOrganizationInvitationBulkRequest request =
+            CreateOrganizationInvitationBulkRequest
                 .builder()
                 .organizationId(organizationId)
                 .requestBody(requestBody)
@@ -462,16 +517,21 @@ public com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkR
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkRequest.class,
+                CreateOrganizationInvitationBulkRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}/invitations/bulk",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         if (_serializedRequestBody == null) {
             throw new Exception("Request body is required");
         }
@@ -487,7 +547,10 @@ public com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkR
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateOrganizationInvitationBulk", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateOrganizationInvitationBulk", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -495,18 +558,28 @@ public com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkR
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateOrganizationInvitationBulk", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateOrganizationInvitationBulk",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateOrganizationInvitationBulk", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateOrganizationInvitationBulk",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateOrganizationInvitationBulk", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateOrganizationInvitationBulk",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -514,42 +587,42 @@ public com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkR
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkResponse
+        CreateOrganizationInvitationBulkResponse.Builder _resBuilder = 
+            CreateOrganizationInvitationBulkResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkResponse _res = _resBuilder.build();
+        CreateOrganizationInvitationBulkResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
                 com.clerk.backend_api.models.components.OrganizationInvitations _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
                     new TypeReference<com.clerk.backend_api.models.components.OrganizationInvitations>() {});
-                _res.withOrganizationInvitations(java.util.Optional.ofNullable(_out));
+                _res.withOrganizationInvitations(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -558,13 +631,13 @@ public com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkR
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -581,8 +654,8 @@ public com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkR
      * @deprecated method: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsRequestBuilder listPending() {
-        return new com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsRequestBuilder(this);
+    public ListPendingOrganizationInvitationsRequestBuilder listPending() {
+        return new ListPendingOrganizationInvitationsRequestBuilder(this);
     }
 
     /**
@@ -599,10 +672,11 @@ public com.clerk.backend_api.models.operations.ListPendingOrganizationInvitation
      * @deprecated method: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsResponse listPending(
+    public ListPendingOrganizationInvitationsResponse listPending(
             String organizationId) throws Exception {
         return listPending(organizationId, Optional.empty(), Optional.empty());
     }
+    
     /**
      * Get a list of pending organization invitations
      * This request returns the list of organization invitations with "pending" status.
@@ -622,12 +696,12 @@ public com.clerk.backend_api.models.operations.ListPendingOrganizationInvitation
      * @deprecated method: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsResponse listPending(
+    public ListPendingOrganizationInvitationsResponse listPending(
             String organizationId,
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) throws Exception {
-        com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsRequest request =
-            com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsRequest
+            Optional<Long> limit,
+            Optional<Long> offset) throws Exception {
+        ListPendingOrganizationInvitationsRequest request =
+            ListPendingOrganizationInvitationsRequest
                 .builder()
                 .organizationId(organizationId)
                 .limit(limit)
@@ -636,7 +710,7 @@ public com.clerk.backend_api.models.operations.ListPendingOrganizationInvitation
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsRequest.class,
+                ListPendingOrganizationInvitationsRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}/invitations/pending",
                 request, null);
@@ -647,7 +721,7 @@ public com.clerk.backend_api.models.operations.ListPendingOrganizationInvitation
                 this.sdkConfiguration.userAgent);
 
         _req.addQueryParams(Utils.getQueryParams(
-                com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsRequest.class,
+                ListPendingOrganizationInvitationsRequest.class,
                 request, 
                 null));
 
@@ -658,7 +732,10 @@ public com.clerk.backend_api.models.operations.ListPendingOrganizationInvitation
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("ListPendingOrganizationInvitations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "ListPendingOrganizationInvitations", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -666,18 +743,28 @@ public com.clerk.backend_api.models.operations.ListPendingOrganizationInvitation
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("ListPendingOrganizationInvitations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "ListPendingOrganizationInvitations",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("ListPendingOrganizationInvitations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "ListPendingOrganizationInvitations",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("ListPendingOrganizationInvitations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "ListPendingOrganizationInvitations",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -685,11 +772,11 @@ public com.clerk.backend_api.models.operations.ListPendingOrganizationInvitation
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        byte[] _fullResponse = Utils.toByteArrayAndClose(_httpRes.body());
+        byte[] _fullResponse = Utils.extractByteArrayFromBody(_httpRes);
         
         @SuppressWarnings("deprecation")
-        com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsResponse
+        ListPendingOrganizationInvitationsResponse.Builder _resBuilder = 
+            ListPendingOrganizationInvitationsResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
@@ -712,22 +799,22 @@ public com.clerk.backend_api.models.operations.ListPendingOrganizationInvitation
                     if (_firstResult.size() < _resolvedLimit) {
                         return Optional.empty();
                     };
-                    long _newOffset = _requestOffset + _firstResult.size();
-                    com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsRequestBuilder _ret = listPending();
+                    long _newOffset = _requestOffset + _firstResult.size(); 
+                    ListPendingOrganizationInvitationsRequestBuilder _ret = listPending();
                     _ret.organizationId(organizationId);
                     _ret.limit(_resolvedLimit);
                     _ret.offset(_newOffset);
                     return Optional.of(_ret.call());
                 });
 
-        com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsResponse _res = _resBuilder.build();
+        ListPendingOrganizationInvitationsResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
                 com.clerk.backend_api.models.components.OrganizationInvitations _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
                     new TypeReference<com.clerk.backend_api.models.components.OrganizationInvitations>() {});
-                _res.withOrganizationInvitations(java.util.Optional.ofNullable(_out));
+                _res.withOrganizationInvitations(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
@@ -739,9 +826,9 @@ public com.clerk.backend_api.models.operations.ListPendingOrganizationInvitation
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
@@ -773,8 +860,8 @@ public com.clerk.backend_api.models.operations.ListPendingOrganizationInvitation
      * Use this request to get an existing organization invitation by ID.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetOrganizationInvitationRequestBuilder get() {
-        return new com.clerk.backend_api.models.operations.GetOrganizationInvitationRequestBuilder(this);
+    public GetOrganizationInvitationRequestBuilder get() {
+        return new GetOrganizationInvitationRequestBuilder(this);
     }
 
     /**
@@ -785,11 +872,11 @@ public com.clerk.backend_api.models.operations.GetOrganizationInvitationRequestB
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetOrganizationInvitationResponse get(
+    public GetOrganizationInvitationResponse get(
             String organizationId,
             String invitationId) throws Exception {
-        com.clerk.backend_api.models.operations.GetOrganizationInvitationRequest request =
-            com.clerk.backend_api.models.operations.GetOrganizationInvitationRequest
+        GetOrganizationInvitationRequest request =
+            GetOrganizationInvitationRequest
                 .builder()
                 .organizationId(organizationId)
                 .invitationId(invitationId)
@@ -797,7 +884,7 @@ public com.clerk.backend_api.models.operations.GetOrganizationInvitationResponse
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.GetOrganizationInvitationRequest.class,
+                GetOrganizationInvitationRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}/invitations/{invitation_id}",
                 request, null);
@@ -814,7 +901,10 @@ public com.clerk.backend_api.models.operations.GetOrganizationInvitationResponse
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetOrganizationInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetOrganizationInvitation", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -822,18 +912,28 @@ public com.clerk.backend_api.models.operations.GetOrganizationInvitationResponse
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetOrganizationInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetOrganizationInvitation",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetOrganizationInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetOrganizationInvitation",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetOrganizationInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetOrganizationInvitation",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -841,42 +941,42 @@ public com.clerk.backend_api.models.operations.GetOrganizationInvitationResponse
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetOrganizationInvitationResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetOrganizationInvitationResponse
+        GetOrganizationInvitationResponse.Builder _resBuilder = 
+            GetOrganizationInvitationResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetOrganizationInvitationResponse _res = _resBuilder.build();
+        GetOrganizationInvitationResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.OrganizationInvitation _out = Utils.mapper().readValue(
+                OrganizationInvitation _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.OrganizationInvitation>() {});
-                _res.withOrganizationInvitation(java.util.Optional.ofNullable(_out));
+                    new TypeReference<OrganizationInvitation>() {});
+                _res.withOrganizationInvitation(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -885,13 +985,13 @@ public com.clerk.backend_api.models.operations.GetOrganizationInvitationResponse
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -905,8 +1005,8 @@ public com.clerk.backend_api.models.operations.GetOrganizationInvitationResponse
      * Only users with "admin" role can revoke invitations.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRequestBuilder revoke() {
-        return new com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRequestBuilder(this);
+    public RevokeOrganizationInvitationRequestBuilder revoke() {
+        return new RevokeOrganizationInvitationRequestBuilder(this);
     }
 
     /**
@@ -922,12 +1022,12 @@ public com.clerk.backend_api.models.operations.RevokeOrganizationInvitationReque
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.RevokeOrganizationInvitationResponse revoke(
+    public RevokeOrganizationInvitationResponse revoke(
             String organizationId,
             String invitationId,
-            com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRequestBody requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRequest request =
-            com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRequest
+            RevokeOrganizationInvitationRequestBody requestBody) throws Exception {
+        RevokeOrganizationInvitationRequest request =
+            RevokeOrganizationInvitationRequest
                 .builder()
                 .organizationId(organizationId)
                 .invitationId(invitationId)
@@ -936,16 +1036,21 @@ public com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRespo
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRequest.class,
+                RevokeOrganizationInvitationRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}/invitations/{invitation_id}/revoke",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         if (_serializedRequestBody == null) {
             throw new Exception("Request body is required");
         }
@@ -961,7 +1066,10 @@ public com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRespo
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("RevokeOrganizationInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "RevokeOrganizationInvitation", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -969,18 +1077,28 @@ public com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRespo
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("RevokeOrganizationInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "RevokeOrganizationInvitation",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("RevokeOrganizationInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "RevokeOrganizationInvitation",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("RevokeOrganizationInvitation", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "RevokeOrganizationInvitation",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -988,42 +1106,42 @@ public com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRespo
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.RevokeOrganizationInvitationResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.RevokeOrganizationInvitationResponse
+        RevokeOrganizationInvitationResponse.Builder _resBuilder = 
+            RevokeOrganizationInvitationResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.RevokeOrganizationInvitationResponse _res = _resBuilder.build();
+        RevokeOrganizationInvitationResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.OrganizationInvitation _out = Utils.mapper().readValue(
+                OrganizationInvitation _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.OrganizationInvitation>() {});
-                _res.withOrganizationInvitation(java.util.Optional.ofNullable(_out));
+                    new TypeReference<OrganizationInvitation>() {});
+                _res.withOrganizationInvitation(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -1032,13 +1150,13 @@ public com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRespo
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/OrganizationMemberships.java b/src/main/java/com/clerk/backend_api/OrganizationMemberships.java
index 21fce9b..2d0fd8c 100644
--- a/src/main/java/com/clerk/backend_api/OrganizationMemberships.java
+++ b/src/main/java/com/clerk/backend_api/OrganizationMemberships.java
@@ -4,32 +4,50 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.OrganizationMembership;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateOrganizationMembershipRequest;
+import com.clerk.backend_api.models.operations.CreateOrganizationMembershipRequestBody;
+import com.clerk.backend_api.models.operations.CreateOrganizationMembershipRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateOrganizationMembershipResponse;
+import com.clerk.backend_api.models.operations.DeleteOrganizationMembershipRequest;
+import com.clerk.backend_api.models.operations.DeleteOrganizationMembershipRequestBuilder;
+import com.clerk.backend_api.models.operations.DeleteOrganizationMembershipResponse;
+import com.clerk.backend_api.models.operations.ListOrganizationMembershipsRequest;
+import com.clerk.backend_api.models.operations.ListOrganizationMembershipsRequestBuilder;
+import com.clerk.backend_api.models.operations.ListOrganizationMembershipsResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataRequest;
+import com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataRequestBody;
+import com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataResponse;
+import com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRequest;
+import com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRequestBody;
+import com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateOrganizationMembershipResponse;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.ReadContext;
 import java.io.InputStream;
+import java.lang.Exception;
 import java.lang.Long;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Object;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.Optional;
-import org.apache.http.NameValuePair;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.Optional; 
 
 public class OrganizationMemberships implements
             MethodCallCreateOrganizationMembership,
@@ -51,8 +69,8 @@ public class OrganizationMemberships implements
      * Only users in the same instance as the organization can be added as members.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateOrganizationMembershipRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreateOrganizationMembershipRequestBuilder(this);
+    public CreateOrganizationMembershipRequestBuilder create() {
+        return new CreateOrganizationMembershipRequestBuilder(this);
     }
 
     /**
@@ -64,11 +82,11 @@ public com.clerk.backend_api.models.operations.CreateOrganizationMembershipReque
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateOrganizationMembershipResponse create(
+    public CreateOrganizationMembershipResponse create(
             String organizationId,
-            com.clerk.backend_api.models.operations.CreateOrganizationMembershipRequestBody requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.CreateOrganizationMembershipRequest request =
-            com.clerk.backend_api.models.operations.CreateOrganizationMembershipRequest
+            CreateOrganizationMembershipRequestBody requestBody) throws Exception {
+        CreateOrganizationMembershipRequest request =
+            CreateOrganizationMembershipRequest
                 .builder()
                 .organizationId(organizationId)
                 .requestBody(requestBody)
@@ -76,16 +94,21 @@ public com.clerk.backend_api.models.operations.CreateOrganizationMembershipRespo
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.CreateOrganizationMembershipRequest.class,
+                CreateOrganizationMembershipRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}/memberships",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         if (_serializedRequestBody == null) {
             throw new Exception("Request body is required");
         }
@@ -101,7 +124,10 @@ public com.clerk.backend_api.models.operations.CreateOrganizationMembershipRespo
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateOrganizationMembership", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateOrganizationMembership", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -109,18 +135,28 @@ public com.clerk.backend_api.models.operations.CreateOrganizationMembershipRespo
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateOrganizationMembership", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateOrganizationMembership",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateOrganizationMembership", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateOrganizationMembership",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateOrganizationMembership", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateOrganizationMembership",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -128,42 +164,42 @@ public com.clerk.backend_api.models.operations.CreateOrganizationMembershipRespo
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateOrganizationMembershipResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateOrganizationMembershipResponse
+        CreateOrganizationMembershipResponse.Builder _resBuilder = 
+            CreateOrganizationMembershipResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateOrganizationMembershipResponse _res = _resBuilder.build();
+        CreateOrganizationMembershipResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.OrganizationMembership _out = Utils.mapper().readValue(
+                OrganizationMembership _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.OrganizationMembership>() {});
-                _res.withOrganizationMembership(java.util.Optional.ofNullable(_out));
+                    new TypeReference<OrganizationMembership>() {});
+                _res.withOrganizationMembership(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -172,13 +208,13 @@ public com.clerk.backend_api.models.operations.CreateOrganizationMembershipRespo
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -188,8 +224,8 @@ public com.clerk.backend_api.models.operations.CreateOrganizationMembershipRespo
      * Retrieves all user memberships for the given organization
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.ListOrganizationMembershipsRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.ListOrganizationMembershipsRequestBuilder(this);
+    public ListOrganizationMembershipsRequestBuilder list() {
+        return new ListOrganizationMembershipsRequestBuilder(this);
     }
 
     /**
@@ -199,10 +235,11 @@ public com.clerk.backend_api.models.operations.ListOrganizationMembershipsReques
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListOrganizationMembershipsResponse list(
+    public ListOrganizationMembershipsResponse list(
             String organizationId) throws Exception {
         return list(organizationId, Optional.empty(), Optional.empty(), Optional.empty());
     }
+    
     /**
      * Get a list of all members of an organization
      * Retrieves all user memberships for the given organization
@@ -218,13 +255,13 @@ we can choose to sort in ascending (ASC) or descending (DESC) order."
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListOrganizationMembershipsResponse list(
+    public ListOrganizationMembershipsResponse list(
             String organizationId,
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset,
-            Optional<? extends String> orderBy) throws Exception {
-        com.clerk.backend_api.models.operations.ListOrganizationMembershipsRequest request =
-            com.clerk.backend_api.models.operations.ListOrganizationMembershipsRequest
+            Optional<Long> limit,
+            Optional<Long> offset,
+            Optional<String> orderBy) throws Exception {
+        ListOrganizationMembershipsRequest request =
+            ListOrganizationMembershipsRequest
                 .builder()
                 .organizationId(organizationId)
                 .limit(limit)
@@ -234,7 +271,7 @@ public com.clerk.backend_api.models.operations.ListOrganizationMembershipsRespon
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.ListOrganizationMembershipsRequest.class,
+                ListOrganizationMembershipsRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}/memberships",
                 request, null);
@@ -245,7 +282,7 @@ public com.clerk.backend_api.models.operations.ListOrganizationMembershipsRespon
                 this.sdkConfiguration.userAgent);
 
         _req.addQueryParams(Utils.getQueryParams(
-                com.clerk.backend_api.models.operations.ListOrganizationMembershipsRequest.class,
+                ListOrganizationMembershipsRequest.class,
                 request, 
                 null));
 
@@ -256,7 +293,10 @@ public com.clerk.backend_api.models.operations.ListOrganizationMembershipsRespon
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("ListOrganizationMemberships", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "ListOrganizationMemberships", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -264,18 +304,28 @@ public com.clerk.backend_api.models.operations.ListOrganizationMembershipsRespon
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "401", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("ListOrganizationMemberships", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "ListOrganizationMemberships",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("ListOrganizationMemberships", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "ListOrganizationMemberships",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("ListOrganizationMemberships", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "ListOrganizationMemberships",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -283,11 +333,11 @@ public com.clerk.backend_api.models.operations.ListOrganizationMembershipsRespon
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        byte[] _fullResponse = Utils.toByteArrayAndClose(_httpRes.body());
+        byte[] _fullResponse = Utils.extractByteArrayFromBody(_httpRes);
         
         @SuppressWarnings("deprecation")
-        com.clerk.backend_api.models.operations.ListOrganizationMembershipsResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.ListOrganizationMembershipsResponse
+        ListOrganizationMembershipsResponse.Builder _resBuilder = 
+            ListOrganizationMembershipsResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
@@ -310,8 +360,8 @@ public com.clerk.backend_api.models.operations.ListOrganizationMembershipsRespon
                     if (_firstResult.size() < _resolvedLimit) {
                         return Optional.empty();
                     };
-                    long _newOffset = _requestOffset + _firstResult.size();
-                    com.clerk.backend_api.models.operations.ListOrganizationMembershipsRequestBuilder _ret = list();
+                    long _newOffset = _requestOffset + _firstResult.size(); 
+                    ListOrganizationMembershipsRequestBuilder _ret = list();
                     _ret.organizationId(organizationId);
                     _ret.limit(_resolvedLimit);
                     _ret.offset(_newOffset);
@@ -319,14 +369,14 @@ public com.clerk.backend_api.models.operations.ListOrganizationMembershipsRespon
                     return Optional.of(_ret.call());
                 });
 
-        com.clerk.backend_api.models.operations.ListOrganizationMembershipsResponse _res = _resBuilder.build();
+        ListOrganizationMembershipsResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
                 com.clerk.backend_api.models.components.OrganizationMemberships _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
                     new TypeReference<com.clerk.backend_api.models.components.OrganizationMemberships>() {});
-                _res.withOrganizationMemberships(java.util.Optional.ofNullable(_out));
+                _res.withOrganizationMemberships(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
@@ -338,9 +388,9 @@ public com.clerk.backend_api.models.operations.ListOrganizationMembershipsRespon
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "401", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
@@ -372,8 +422,8 @@ public com.clerk.backend_api.models.operations.ListOrganizationMembershipsRespon
      * Updates the properties of an existing organization membership
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRequestBuilder update() {
-        return new com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRequestBuilder(this);
+    public UpdateOrganizationMembershipRequestBuilder update() {
+        return new UpdateOrganizationMembershipRequestBuilder(this);
     }
 
     /**
@@ -385,12 +435,12 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipReque
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipResponse update(
+    public UpdateOrganizationMembershipResponse update(
             String organizationId,
             String userId,
-            com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRequestBody requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRequest request =
-            com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRequest
+            UpdateOrganizationMembershipRequestBody requestBody) throws Exception {
+        UpdateOrganizationMembershipRequest request =
+            UpdateOrganizationMembershipRequest
                 .builder()
                 .organizationId(organizationId)
                 .userId(userId)
@@ -399,16 +449,21 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRespo
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRequest.class,
+                UpdateOrganizationMembershipRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}/memberships/{user_id}",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         if (_serializedRequestBody == null) {
             throw new Exception("Request body is required");
         }
@@ -424,7 +479,10 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRespo
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateOrganizationMembership", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateOrganizationMembership", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -432,18 +490,28 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRespo
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateOrganizationMembership", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateOrganizationMembership",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateOrganizationMembership", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateOrganizationMembership",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateOrganizationMembership", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateOrganizationMembership",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -451,42 +519,42 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRespo
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateOrganizationMembershipResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateOrganizationMembershipResponse
+        UpdateOrganizationMembershipResponse.Builder _resBuilder = 
+            UpdateOrganizationMembershipResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateOrganizationMembershipResponse _res = _resBuilder.build();
+        UpdateOrganizationMembershipResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.OrganizationMembership _out = Utils.mapper().readValue(
+                OrganizationMembership _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.OrganizationMembership>() {});
-                _res.withOrganizationMembership(java.util.Optional.ofNullable(_out));
+                    new TypeReference<OrganizationMembership>() {});
+                _res.withOrganizationMembership(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -495,13 +563,13 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRespo
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -511,8 +579,8 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRespo
      * Removes the given membership from the organization
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeleteOrganizationMembershipRequestBuilder delete() {
-        return new com.clerk.backend_api.models.operations.DeleteOrganizationMembershipRequestBuilder(this);
+    public DeleteOrganizationMembershipRequestBuilder delete() {
+        return new DeleteOrganizationMembershipRequestBuilder(this);
     }
 
     /**
@@ -523,11 +591,11 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationMembershipReque
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeleteOrganizationMembershipResponse delete(
+    public DeleteOrganizationMembershipResponse delete(
             String organizationId,
             String userId) throws Exception {
-        com.clerk.backend_api.models.operations.DeleteOrganizationMembershipRequest request =
-            com.clerk.backend_api.models.operations.DeleteOrganizationMembershipRequest
+        DeleteOrganizationMembershipRequest request =
+            DeleteOrganizationMembershipRequest
                 .builder()
                 .organizationId(organizationId)
                 .userId(userId)
@@ -535,7 +603,7 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationMembershipRespo
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DeleteOrganizationMembershipRequest.class,
+                DeleteOrganizationMembershipRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}/memberships/{user_id}",
                 request, null);
@@ -552,7 +620,10 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationMembershipRespo
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeleteOrganizationMembership", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeleteOrganizationMembership", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -560,18 +631,28 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationMembershipRespo
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeleteOrganizationMembership", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeleteOrganizationMembership",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeleteOrganizationMembership", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeleteOrganizationMembership",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeleteOrganizationMembership", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeleteOrganizationMembership",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -579,42 +660,42 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationMembershipRespo
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeleteOrganizationMembershipResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeleteOrganizationMembershipResponse
+        DeleteOrganizationMembershipResponse.Builder _resBuilder = 
+            DeleteOrganizationMembershipResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeleteOrganizationMembershipResponse _res = _resBuilder.build();
+        DeleteOrganizationMembershipResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.OrganizationMembership _out = Utils.mapper().readValue(
+                OrganizationMembership _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.OrganizationMembership>() {});
-                _res.withOrganizationMembership(java.util.Optional.ofNullable(_out));
+                    new TypeReference<OrganizationMembership>() {});
+                _res.withOrganizationMembership(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -623,13 +704,13 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationMembershipRespo
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -641,8 +722,8 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationMembershipRespo
      * You can remove metadata keys at any level by setting their value to `null`.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataRequestBuilder updateMetadata() {
-        return new com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataRequestBuilder(this);
+    public UpdateOrganizationMembershipMetadataRequestBuilder updateMetadata() {
+        return new UpdateOrganizationMembershipMetadataRequestBuilder(this);
     }
 
     /**
@@ -656,12 +737,12 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetad
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataResponse updateMetadata(
+    public UpdateOrganizationMembershipMetadataResponse updateMetadata(
             String organizationId,
             String userId,
-            com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataRequestBody requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataRequest request =
-            com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataRequest
+            UpdateOrganizationMembershipMetadataRequestBody requestBody) throws Exception {
+        UpdateOrganizationMembershipMetadataRequest request =
+            UpdateOrganizationMembershipMetadataRequest
                 .builder()
                 .organizationId(organizationId)
                 .userId(userId)
@@ -670,16 +751,21 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetad
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataRequest.class,
+                UpdateOrganizationMembershipMetadataRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}/memberships/{user_id}/metadata",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         if (_serializedRequestBody == null) {
             throw new Exception("Request body is required");
         }
@@ -695,7 +781,10 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetad
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateOrganizationMembershipMetadata", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateOrganizationMembershipMetadata", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -703,18 +792,28 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetad
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateOrganizationMembershipMetadata", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateOrganizationMembershipMetadata",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateOrganizationMembershipMetadata", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateOrganizationMembershipMetadata",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateOrganizationMembershipMetadata", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateOrganizationMembershipMetadata",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -722,42 +821,42 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetad
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataResponse
+        UpdateOrganizationMembershipMetadataResponse.Builder _resBuilder = 
+            UpdateOrganizationMembershipMetadataResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataResponse _res = _resBuilder.build();
+        UpdateOrganizationMembershipMetadataResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.OrganizationMembership _out = Utils.mapper().readValue(
+                OrganizationMembership _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.OrganizationMembership>() {});
-                _res.withOrganizationMembership(java.util.Optional.ofNullable(_out));
+                    new TypeReference<OrganizationMembership>() {});
+                _res.withOrganizationMembership(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -766,13 +865,13 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetad
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/Organizations.java b/src/main/java/com/clerk/backend_api/Organizations.java
index a224649..eb244c0 100644
--- a/src/main/java/com/clerk/backend_api/Organizations.java
+++ b/src/main/java/com/clerk/backend_api/Organizations.java
@@ -4,28 +4,56 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.models.components.Organization;
+import com.clerk.backend_api.models.components.OrganizationWithLogo;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateOrganizationRequestBody;
+import com.clerk.backend_api.models.operations.CreateOrganizationRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateOrganizationResponse;
+import com.clerk.backend_api.models.operations.DeleteOrganizationLogoRequest;
+import com.clerk.backend_api.models.operations.DeleteOrganizationLogoRequestBuilder;
+import com.clerk.backend_api.models.operations.DeleteOrganizationLogoResponse;
+import com.clerk.backend_api.models.operations.DeleteOrganizationRequest;
+import com.clerk.backend_api.models.operations.DeleteOrganizationRequestBuilder;
+import com.clerk.backend_api.models.operations.DeleteOrganizationResponse;
+import com.clerk.backend_api.models.operations.GetOrganizationRequest;
+import com.clerk.backend_api.models.operations.GetOrganizationRequestBuilder;
+import com.clerk.backend_api.models.operations.GetOrganizationResponse;
+import com.clerk.backend_api.models.operations.ListOrganizationsRequest;
+import com.clerk.backend_api.models.operations.ListOrganizationsRequestBuilder;
+import com.clerk.backend_api.models.operations.ListOrganizationsResponse;
+import com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequest;
+import com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequestBody;
+import com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequestBuilder;
+import com.clerk.backend_api.models.operations.MergeOrganizationMetadataResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.UpdateOrganizationRequest;
+import com.clerk.backend_api.models.operations.UpdateOrganizationRequestBody;
+import com.clerk.backend_api.models.operations.UpdateOrganizationRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateOrganizationResponse;
+import com.clerk.backend_api.models.operations.UploadOrganizationLogoRequest;
+import com.clerk.backend_api.models.operations.UploadOrganizationLogoRequestBody;
+import com.clerk.backend_api.models.operations.UploadOrganizationLogoRequestBuilder;
+import com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.apache.http.NameValuePair;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class Organizations implements
             MethodCallListOrganizations,
@@ -52,8 +80,8 @@ public class Organizations implements
      * Most recent organizations will be returned first.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.ListOrganizationsRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.ListOrganizationsRequestBuilder(this);
+    public ListOrganizationsRequestBuilder list() {
+        return new ListOrganizationsRequestBuilder(this);
     }
 
     /**
@@ -66,8 +94,8 @@ public com.clerk.backend_api.models.operations.ListOrganizationsRequestBuilder l
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListOrganizationsResponse list(
-            com.clerk.backend_api.models.operations.ListOrganizationsRequest request) throws Exception {
+    public ListOrganizationsResponse list(
+            ListOrganizationsRequest request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
@@ -79,7 +107,7 @@ public com.clerk.backend_api.models.operations.ListOrganizationsResponse list(
                 this.sdkConfiguration.userAgent);
 
         _req.addQueryParams(Utils.getQueryParams(
-                com.clerk.backend_api.models.operations.ListOrganizationsRequest.class,
+                ListOrganizationsRequest.class,
                 request, 
                 null));
 
@@ -90,7 +118,10 @@ public com.clerk.backend_api.models.operations.ListOrganizationsResponse list(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("ListOrganizations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "ListOrganizations", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -98,18 +129,28 @@ public com.clerk.backend_api.models.operations.ListOrganizationsResponse list(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("ListOrganizations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "ListOrganizations",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("ListOrganizations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "ListOrganizations",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("ListOrganizations", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "ListOrganizations",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -117,42 +158,42 @@ public com.clerk.backend_api.models.operations.ListOrganizationsResponse list(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.ListOrganizationsResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.ListOrganizationsResponse
+        ListOrganizationsResponse.Builder _resBuilder = 
+            ListOrganizationsResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.ListOrganizationsResponse _res = _resBuilder.build();
+        ListOrganizationsResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
                 com.clerk.backend_api.models.components.Organizations _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
                     new TypeReference<com.clerk.backend_api.models.components.Organizations>() {});
-                _res.withOrganizations(java.util.Optional.ofNullable(_out));
+                _res.withOrganizations(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -161,13 +202,13 @@ public com.clerk.backend_api.models.operations.ListOrganizationsResponse list(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -185,8 +226,8 @@ public com.clerk.backend_api.models.operations.ListOrganizationsResponse list(
      * Public metadata can be accessed from the Backend API, and are read-only from the Frontend API.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateOrganizationRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreateOrganizationRequestBuilder(this);
+    public CreateOrganizationRequestBuilder create() {
+        return new CreateOrganizationRequestBuilder(this);
     }
 
     /**
@@ -203,9 +244,10 @@ public com.clerk.backend_api.models.operations.CreateOrganizationRequestBuilder
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateOrganizationResponse createDirect() throws Exception {
+    public CreateOrganizationResponse createDirect() throws Exception {
         return create(Optional.empty());
     }
+    
     /**
      * Create an organization
      * Creates a new organization with the given name for an instance.
@@ -221,18 +263,23 @@ public com.clerk.backend_api.models.operations.CreateOrganizationResponse create
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateOrganizationResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateOrganizationRequestBody> request) throws Exception {
+    public CreateOrganizationResponse create(
+            Optional<? extends CreateOrganizationRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/organizations");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.CreateOrganizationRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends CreateOrganizationRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -245,7 +292,10 @@ public com.clerk.backend_api.models.operations.CreateOrganizationResponse create
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateOrganization", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -253,18 +303,28 @@ public com.clerk.backend_api.models.operations.CreateOrganizationResponse create
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateOrganization",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateOrganization",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateOrganization",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -272,42 +332,42 @@ public com.clerk.backend_api.models.operations.CreateOrganizationResponse create
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateOrganizationResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateOrganizationResponse
+        CreateOrganizationResponse.Builder _resBuilder = 
+            CreateOrganizationResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateOrganizationResponse _res = _resBuilder.build();
+        CreateOrganizationResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Organization _out = Utils.mapper().readValue(
+                Organization _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Organization>() {});
-                _res.withOrganization(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Organization>() {});
+                _res.withOrganization(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -316,13 +376,13 @@ public com.clerk.backend_api.models.operations.CreateOrganizationResponse create
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -332,8 +392,8 @@ public com.clerk.backend_api.models.operations.CreateOrganizationResponse create
      * Fetches the organization whose ID or slug matches the provided `id_or_slug` URL query parameter.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetOrganizationRequestBuilder get() {
-        return new com.clerk.backend_api.models.operations.GetOrganizationRequestBuilder(this);
+    public GetOrganizationRequestBuilder get() {
+        return new GetOrganizationRequestBuilder(this);
     }
 
     /**
@@ -343,17 +403,17 @@ public com.clerk.backend_api.models.operations.GetOrganizationRequestBuilder get
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetOrganizationResponse get(
+    public GetOrganizationResponse get(
             String organizationId) throws Exception {
-        com.clerk.backend_api.models.operations.GetOrganizationRequest request =
-            com.clerk.backend_api.models.operations.GetOrganizationRequest
+        GetOrganizationRequest request =
+            GetOrganizationRequest
                 .builder()
                 .organizationId(organizationId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.GetOrganizationRequest.class,
+                GetOrganizationRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}",
                 request, null);
@@ -370,7 +430,10 @@ public com.clerk.backend_api.models.operations.GetOrganizationResponse get(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetOrganization", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -378,18 +441,28 @@ public com.clerk.backend_api.models.operations.GetOrganizationResponse get(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetOrganization",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetOrganization",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetOrganization",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -397,42 +470,42 @@ public com.clerk.backend_api.models.operations.GetOrganizationResponse get(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetOrganizationResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetOrganizationResponse
+        GetOrganizationResponse.Builder _resBuilder = 
+            GetOrganizationResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetOrganizationResponse _res = _resBuilder.build();
+        GetOrganizationResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Organization _out = Utils.mapper().readValue(
+                Organization _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Organization>() {});
-                _res.withOrganization(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Organization>() {});
+                _res.withOrganization(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -441,13 +514,13 @@ public com.clerk.backend_api.models.operations.GetOrganizationResponse get(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -457,8 +530,8 @@ public com.clerk.backend_api.models.operations.GetOrganizationResponse get(
      * Updates an existing organization
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateOrganizationRequestBuilder update() {
-        return new com.clerk.backend_api.models.operations.UpdateOrganizationRequestBuilder(this);
+    public UpdateOrganizationRequestBuilder update() {
+        return new UpdateOrganizationRequestBuilder(this);
     }
 
     /**
@@ -469,11 +542,11 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationRequestBuilder
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateOrganizationResponse update(
+    public UpdateOrganizationResponse update(
             String organizationId,
-            com.clerk.backend_api.models.operations.UpdateOrganizationRequestBody requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.UpdateOrganizationRequest request =
-            com.clerk.backend_api.models.operations.UpdateOrganizationRequest
+            UpdateOrganizationRequestBody requestBody) throws Exception {
+        UpdateOrganizationRequest request =
+            UpdateOrganizationRequest
                 .builder()
                 .organizationId(organizationId)
                 .requestBody(requestBody)
@@ -481,16 +554,21 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationResponse update
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UpdateOrganizationRequest.class,
+                UpdateOrganizationRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         if (_serializedRequestBody == null) {
             throw new Exception("Request body is required");
         }
@@ -506,7 +584,10 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationResponse update
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateOrganization", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -514,18 +595,28 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationResponse update
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateOrganization",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateOrganization",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateOrganization",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -533,42 +624,42 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationResponse update
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateOrganizationResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateOrganizationResponse
+        UpdateOrganizationResponse.Builder _resBuilder = 
+            UpdateOrganizationResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateOrganizationResponse _res = _resBuilder.build();
+        UpdateOrganizationResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Organization _out = Utils.mapper().readValue(
+                Organization _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Organization>() {});
-                _res.withOrganization(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Organization>() {});
+                _res.withOrganization(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -577,13 +668,13 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationResponse update
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -595,8 +686,8 @@ public com.clerk.backend_api.models.operations.UpdateOrganizationResponse update
      * This is not reversible.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeleteOrganizationRequestBuilder delete() {
-        return new com.clerk.backend_api.models.operations.DeleteOrganizationRequestBuilder(this);
+    public DeleteOrganizationRequestBuilder delete() {
+        return new DeleteOrganizationRequestBuilder(this);
     }
 
     /**
@@ -608,17 +699,17 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationRequestBuilder
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeleteOrganizationResponse delete(
+    public DeleteOrganizationResponse delete(
             String organizationId) throws Exception {
-        com.clerk.backend_api.models.operations.DeleteOrganizationRequest request =
-            com.clerk.backend_api.models.operations.DeleteOrganizationRequest
+        DeleteOrganizationRequest request =
+            DeleteOrganizationRequest
                 .builder()
                 .organizationId(organizationId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DeleteOrganizationRequest.class,
+                DeleteOrganizationRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}",
                 request, null);
@@ -635,7 +726,10 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationResponse delete
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeleteOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeleteOrganization", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -643,18 +737,28 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationResponse delete
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeleteOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeleteOrganization",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeleteOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeleteOrganization",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeleteOrganization", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeleteOrganization",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -662,42 +766,42 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationResponse delete
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeleteOrganizationResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeleteOrganizationResponse
+        DeleteOrganizationResponse.Builder _resBuilder = 
+            DeleteOrganizationResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeleteOrganizationResponse _res = _resBuilder.build();
+        DeleteOrganizationResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.DeletedObject _out = Utils.mapper().readValue(
+                DeletedObject _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.DeletedObject>() {});
-                _res.withDeletedObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<DeletedObject>() {});
+                _res.withDeletedObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -706,13 +810,13 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationResponse delete
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -725,8 +829,8 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationResponse delete
      * You can remove metadata keys at any level by setting their value to `null`.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequestBuilder mergeMetadata() {
-        return new com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequestBuilder(this);
+    public MergeOrganizationMetadataRequestBuilder mergeMetadata() {
+        return new MergeOrganizationMetadataRequestBuilder(this);
     }
 
     /**
@@ -740,11 +844,11 @@ public com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequestB
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.MergeOrganizationMetadataResponse mergeMetadata(
+    public MergeOrganizationMetadataResponse mergeMetadata(
             String organizationId,
-            com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequestBody requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequest request =
-            com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequest
+            MergeOrganizationMetadataRequestBody requestBody) throws Exception {
+        MergeOrganizationMetadataRequest request =
+            MergeOrganizationMetadataRequest
                 .builder()
                 .organizationId(organizationId)
                 .requestBody(requestBody)
@@ -752,16 +856,21 @@ public com.clerk.backend_api.models.operations.MergeOrganizationMetadataResponse
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequest.class,
+                MergeOrganizationMetadataRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}/metadata",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         if (_serializedRequestBody == null) {
             throw new Exception("Request body is required");
         }
@@ -777,7 +886,10 @@ public com.clerk.backend_api.models.operations.MergeOrganizationMetadataResponse
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("MergeOrganizationMetadata", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "MergeOrganizationMetadata", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -785,18 +897,28 @@ public com.clerk.backend_api.models.operations.MergeOrganizationMetadataResponse
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("MergeOrganizationMetadata", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "MergeOrganizationMetadata",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("MergeOrganizationMetadata", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "MergeOrganizationMetadata",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("MergeOrganizationMetadata", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "MergeOrganizationMetadata",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -804,42 +926,42 @@ public com.clerk.backend_api.models.operations.MergeOrganizationMetadataResponse
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.MergeOrganizationMetadataResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.MergeOrganizationMetadataResponse
+        MergeOrganizationMetadataResponse.Builder _resBuilder = 
+            MergeOrganizationMetadataResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.MergeOrganizationMetadataResponse _res = _resBuilder.build();
+        MergeOrganizationMetadataResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Organization _out = Utils.mapper().readValue(
+                Organization _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Organization>() {});
-                _res.withOrganization(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Organization>() {});
+                _res.withOrganization(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -848,13 +970,13 @@ public com.clerk.backend_api.models.operations.MergeOrganizationMetadataResponse
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -867,8 +989,8 @@ public com.clerk.backend_api.models.operations.MergeOrganizationMetadataResponse
      * Only the following file content types are supported: `image/jpeg`, `image/png`, `image/gif`, `image/webp`, `image/x-icon`, `image/vnd.microsoft.icon`.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UploadOrganizationLogoRequestBuilder uploadLogo() {
-        return new com.clerk.backend_api.models.operations.UploadOrganizationLogoRequestBuilder(this);
+    public UploadOrganizationLogoRequestBuilder uploadLogo() {
+        return new UploadOrganizationLogoRequestBuilder(this);
     }
 
     /**
@@ -881,10 +1003,11 @@ public com.clerk.backend_api.models.operations.UploadOrganizationLogoRequestBuil
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse uploadLogo(
+    public UploadOrganizationLogoResponse uploadLogo(
             String organizationId) throws Exception {
         return uploadLogo(organizationId, Optional.empty());
     }
+    
     /**
      * Upload a logo for the organization
      * Set or replace an organization's logo, by uploading an image file.
@@ -896,11 +1019,11 @@ public com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse up
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse uploadLogo(
+    public UploadOrganizationLogoResponse uploadLogo(
             String organizationId,
-            Optional<? extends com.clerk.backend_api.models.operations.UploadOrganizationLogoRequestBody> requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.UploadOrganizationLogoRequest request =
-            com.clerk.backend_api.models.operations.UploadOrganizationLogoRequest
+            Optional<? extends UploadOrganizationLogoRequestBody> requestBody) throws Exception {
+        UploadOrganizationLogoRequest request =
+            UploadOrganizationLogoRequest
                 .builder()
                 .organizationId(organizationId)
                 .requestBody(requestBody)
@@ -908,16 +1031,21 @@ public com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse up
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UploadOrganizationLogoRequest.class,
+                UploadOrganizationLogoRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}/logo",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PUT");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "multipart", false);
+                _convertedRequest, 
+                "requestBody",
+                "multipart",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -930,7 +1058,10 @@ public com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse up
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UploadOrganizationLogo", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UploadOrganizationLogo", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -938,18 +1069,28 @@ public com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse up
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "404", "413", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UploadOrganizationLogo", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UploadOrganizationLogo",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UploadOrganizationLogo", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UploadOrganizationLogo",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UploadOrganizationLogo", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UploadOrganizationLogo",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -957,42 +1098,42 @@ public com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse up
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse
+        UploadOrganizationLogoResponse.Builder _resBuilder = 
+            UploadOrganizationLogoResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse _res = _resBuilder.build();
+        UploadOrganizationLogoResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.OrganizationWithLogo _out = Utils.mapper().readValue(
+                OrganizationWithLogo _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.OrganizationWithLogo>() {});
-                _res.withOrganizationWithLogo(java.util.Optional.ofNullable(_out));
+                    new TypeReference<OrganizationWithLogo>() {});
+                _res.withOrganizationWithLogo(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "403", "404", "413")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -1001,13 +1142,13 @@ public com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse up
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -1016,8 +1157,8 @@ public com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse up
      * Delete the organization's logo.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeleteOrganizationLogoRequestBuilder deleteLogo() {
-        return new com.clerk.backend_api.models.operations.DeleteOrganizationLogoRequestBuilder(this);
+    public DeleteOrganizationLogoRequestBuilder deleteLogo() {
+        return new DeleteOrganizationLogoRequestBuilder(this);
     }
 
     /**
@@ -1026,17 +1167,17 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationLogoRequestBuil
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeleteOrganizationLogoResponse deleteLogo(
+    public DeleteOrganizationLogoResponse deleteLogo(
             String organizationId) throws Exception {
-        com.clerk.backend_api.models.operations.DeleteOrganizationLogoRequest request =
-            com.clerk.backend_api.models.operations.DeleteOrganizationLogoRequest
+        DeleteOrganizationLogoRequest request =
+            DeleteOrganizationLogoRequest
                 .builder()
                 .organizationId(organizationId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DeleteOrganizationLogoRequest.class,
+                DeleteOrganizationLogoRequest.class,
                 _baseUrl,
                 "/organizations/{organization_id}/logo",
                 request, null);
@@ -1053,7 +1194,10 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationLogoResponse de
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeleteOrganizationLogo", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeleteOrganizationLogo", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -1061,18 +1205,28 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationLogoResponse de
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeleteOrganizationLogo", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeleteOrganizationLogo",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeleteOrganizationLogo", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeleteOrganizationLogo",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeleteOrganizationLogo", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeleteOrganizationLogo",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -1080,42 +1234,42 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationLogoResponse de
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeleteOrganizationLogoResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeleteOrganizationLogoResponse
+        DeleteOrganizationLogoResponse.Builder _resBuilder = 
+            DeleteOrganizationLogoResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeleteOrganizationLogoResponse _res = _resBuilder.build();
+        DeleteOrganizationLogoResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Organization _out = Utils.mapper().readValue(
+                Organization _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Organization>() {});
-                _res.withOrganization(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Organization>() {});
+                _res.withOrganization(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -1124,13 +1278,13 @@ public com.clerk.backend_api.models.operations.DeleteOrganizationLogoResponse de
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/PhoneNumbers.java b/src/main/java/com/clerk/backend_api/PhoneNumbers.java
index 6b0c632..7aa0465 100644
--- a/src/main/java/com/clerk/backend_api/PhoneNumbers.java
+++ b/src/main/java/com/clerk/backend_api/PhoneNumbers.java
@@ -4,27 +4,41 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.models.components.PhoneNumber;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreatePhoneNumberRequestBody;
+import com.clerk.backend_api.models.operations.CreatePhoneNumberRequestBuilder;
+import com.clerk.backend_api.models.operations.CreatePhoneNumberResponse;
+import com.clerk.backend_api.models.operations.DeletePhoneNumberRequest;
+import com.clerk.backend_api.models.operations.DeletePhoneNumberRequestBuilder;
+import com.clerk.backend_api.models.operations.DeletePhoneNumberResponse;
+import com.clerk.backend_api.models.operations.GetPhoneNumberRequest;
+import com.clerk.backend_api.models.operations.GetPhoneNumberRequestBuilder;
+import com.clerk.backend_api.models.operations.GetPhoneNumberResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.UpdatePhoneNumberRequest;
+import com.clerk.backend_api.models.operations.UpdatePhoneNumberRequestBody;
+import com.clerk.backend_api.models.operations.UpdatePhoneNumberRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class PhoneNumbers implements
             MethodCallCreatePhoneNumber,
@@ -44,8 +58,8 @@ public class PhoneNumbers implements
      * Create a new phone number
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreatePhoneNumberRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreatePhoneNumberRequestBuilder(this);
+    public CreatePhoneNumberRequestBuilder create() {
+        return new CreatePhoneNumberRequestBuilder(this);
     }
 
     /**
@@ -54,9 +68,10 @@ public com.clerk.backend_api.models.operations.CreatePhoneNumberRequestBuilder c
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreatePhoneNumberResponse createDirect() throws Exception {
+    public CreatePhoneNumberResponse createDirect() throws Exception {
         return create(Optional.empty());
     }
+    
     /**
      * Create a phone number
      * Create a new phone number
@@ -64,18 +79,23 @@ public com.clerk.backend_api.models.operations.CreatePhoneNumberResponse createD
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreatePhoneNumberResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreatePhoneNumberRequestBody> request) throws Exception {
+    public CreatePhoneNumberResponse create(
+            Optional<? extends CreatePhoneNumberRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/phone_numbers");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.CreatePhoneNumberRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends CreatePhoneNumberRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -88,7 +108,10 @@ public com.clerk.backend_api.models.operations.CreatePhoneNumberResponse create(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreatePhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreatePhoneNumber", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -96,18 +119,28 @@ public com.clerk.backend_api.models.operations.CreatePhoneNumberResponse create(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreatePhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreatePhoneNumber",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreatePhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreatePhoneNumber",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreatePhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreatePhoneNumber",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -115,42 +148,42 @@ public com.clerk.backend_api.models.operations.CreatePhoneNumberResponse create(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreatePhoneNumberResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreatePhoneNumberResponse
+        CreatePhoneNumberResponse.Builder _resBuilder = 
+            CreatePhoneNumberResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreatePhoneNumberResponse _res = _resBuilder.build();
+        CreatePhoneNumberResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.PhoneNumber _out = Utils.mapper().readValue(
+                PhoneNumber _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.PhoneNumber>() {});
-                _res.withPhoneNumber(java.util.Optional.ofNullable(_out));
+                    new TypeReference<PhoneNumber>() {});
+                _res.withPhoneNumber(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -159,13 +192,13 @@ public com.clerk.backend_api.models.operations.CreatePhoneNumberResponse create(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -175,8 +208,8 @@ public com.clerk.backend_api.models.operations.CreatePhoneNumberResponse create(
      * Returns the details of a phone number
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetPhoneNumberRequestBuilder get() {
-        return new com.clerk.backend_api.models.operations.GetPhoneNumberRequestBuilder(this);
+    public GetPhoneNumberRequestBuilder get() {
+        return new GetPhoneNumberRequestBuilder(this);
     }
 
     /**
@@ -186,17 +219,17 @@ public com.clerk.backend_api.models.operations.GetPhoneNumberRequestBuilder get(
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetPhoneNumberResponse get(
+    public GetPhoneNumberResponse get(
             String phoneNumberId) throws Exception {
-        com.clerk.backend_api.models.operations.GetPhoneNumberRequest request =
-            com.clerk.backend_api.models.operations.GetPhoneNumberRequest
+        GetPhoneNumberRequest request =
+            GetPhoneNumberRequest
                 .builder()
                 .phoneNumberId(phoneNumberId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.GetPhoneNumberRequest.class,
+                GetPhoneNumberRequest.class,
                 _baseUrl,
                 "/phone_numbers/{phone_number_id}",
                 request, null);
@@ -213,7 +246,10 @@ public com.clerk.backend_api.models.operations.GetPhoneNumberResponse get(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetPhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetPhoneNumber", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -221,18 +257,28 @@ public com.clerk.backend_api.models.operations.GetPhoneNumberResponse get(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetPhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetPhoneNumber",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetPhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetPhoneNumber",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetPhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetPhoneNumber",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -240,42 +286,42 @@ public com.clerk.backend_api.models.operations.GetPhoneNumberResponse get(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetPhoneNumberResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetPhoneNumberResponse
+        GetPhoneNumberResponse.Builder _resBuilder = 
+            GetPhoneNumberResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetPhoneNumberResponse _res = _resBuilder.build();
+        GetPhoneNumberResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.PhoneNumber _out = Utils.mapper().readValue(
+                PhoneNumber _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.PhoneNumber>() {});
-                _res.withPhoneNumber(java.util.Optional.ofNullable(_out));
+                    new TypeReference<PhoneNumber>() {});
+                _res.withPhoneNumber(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -284,13 +330,13 @@ public com.clerk.backend_api.models.operations.GetPhoneNumberResponse get(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -300,8 +346,8 @@ public com.clerk.backend_api.models.operations.GetPhoneNumberResponse get(
      * Delete the phone number with the given ID
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeletePhoneNumberRequestBuilder delete() {
-        return new com.clerk.backend_api.models.operations.DeletePhoneNumberRequestBuilder(this);
+    public DeletePhoneNumberRequestBuilder delete() {
+        return new DeletePhoneNumberRequestBuilder(this);
     }
 
     /**
@@ -311,17 +357,17 @@ public com.clerk.backend_api.models.operations.DeletePhoneNumberRequestBuilder d
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeletePhoneNumberResponse delete(
+    public DeletePhoneNumberResponse delete(
             String phoneNumberId) throws Exception {
-        com.clerk.backend_api.models.operations.DeletePhoneNumberRequest request =
-            com.clerk.backend_api.models.operations.DeletePhoneNumberRequest
+        DeletePhoneNumberRequest request =
+            DeletePhoneNumberRequest
                 .builder()
                 .phoneNumberId(phoneNumberId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DeletePhoneNumberRequest.class,
+                DeletePhoneNumberRequest.class,
                 _baseUrl,
                 "/phone_numbers/{phone_number_id}",
                 request, null);
@@ -338,7 +384,10 @@ public com.clerk.backend_api.models.operations.DeletePhoneNumberResponse delete(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeletePhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeletePhoneNumber", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -346,18 +395,28 @@ public com.clerk.backend_api.models.operations.DeletePhoneNumberResponse delete(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeletePhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeletePhoneNumber",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeletePhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeletePhoneNumber",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeletePhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeletePhoneNumber",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -365,42 +424,42 @@ public com.clerk.backend_api.models.operations.DeletePhoneNumberResponse delete(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeletePhoneNumberResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeletePhoneNumberResponse
+        DeletePhoneNumberResponse.Builder _resBuilder = 
+            DeletePhoneNumberResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeletePhoneNumberResponse _res = _resBuilder.build();
+        DeletePhoneNumberResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.DeletedObject _out = Utils.mapper().readValue(
+                DeletedObject _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.DeletedObject>() {});
-                _res.withDeletedObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<DeletedObject>() {});
+                _res.withDeletedObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -409,13 +468,13 @@ public com.clerk.backend_api.models.operations.DeletePhoneNumberResponse delete(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -425,8 +484,8 @@ public com.clerk.backend_api.models.operations.DeletePhoneNumberResponse delete(
      * Updates a phone number
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdatePhoneNumberRequestBuilder update() {
-        return new com.clerk.backend_api.models.operations.UpdatePhoneNumberRequestBuilder(this);
+    public UpdatePhoneNumberRequestBuilder update() {
+        return new UpdatePhoneNumberRequestBuilder(this);
     }
 
     /**
@@ -436,10 +495,11 @@ public com.clerk.backend_api.models.operations.UpdatePhoneNumberRequestBuilder u
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse update(
+    public UpdatePhoneNumberResponse update(
             String phoneNumberId) throws Exception {
         return update(phoneNumberId, Optional.empty());
     }
+    
     /**
      * Update a phone number
      * Updates a phone number
@@ -448,11 +508,11 @@ public com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse update(
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse update(
+    public UpdatePhoneNumberResponse update(
             String phoneNumberId,
-            Optional<? extends com.clerk.backend_api.models.operations.UpdatePhoneNumberRequestBody> requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.UpdatePhoneNumberRequest request =
-            com.clerk.backend_api.models.operations.UpdatePhoneNumberRequest
+            Optional<? extends UpdatePhoneNumberRequestBody> requestBody) throws Exception {
+        UpdatePhoneNumberRequest request =
+            UpdatePhoneNumberRequest
                 .builder()
                 .phoneNumberId(phoneNumberId)
                 .requestBody(requestBody)
@@ -460,16 +520,21 @@ public com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse update(
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UpdatePhoneNumberRequest.class,
+                UpdatePhoneNumberRequest.class,
                 _baseUrl,
                 "/phone_numbers/{phone_number_id}",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -482,7 +547,10 @@ public com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse update(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdatePhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdatePhoneNumber", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -490,18 +558,28 @@ public com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse update(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdatePhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdatePhoneNumber",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdatePhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdatePhoneNumber",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdatePhoneNumber", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdatePhoneNumber",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -509,42 +587,42 @@ public com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse update(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse
+        UpdatePhoneNumberResponse.Builder _resBuilder = 
+            UpdatePhoneNumberResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse _res = _resBuilder.build();
+        UpdatePhoneNumberResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.PhoneNumber _out = Utils.mapper().readValue(
+                PhoneNumber _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.PhoneNumber>() {});
-                _res.withPhoneNumber(java.util.Optional.ofNullable(_out));
+                    new TypeReference<PhoneNumber>() {});
+                _res.withPhoneNumber(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -553,13 +631,13 @@ public com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse update(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/Proxy.java b/src/main/java/com/clerk/backend_api/Proxy.java
index be6a508..2861bd3 100644
--- a/src/main/java/com/clerk/backend_api/Proxy.java
+++ b/src/main/java/com/clerk/backend_api/Proxy.java
@@ -4,27 +4,30 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.ProxyCheck;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.VerifyDomainProxyRequestBody;
+import com.clerk.backend_api.models.operations.VerifyDomainProxyRequestBuilder;
+import com.clerk.backend_api.models.operations.VerifyDomainProxyResponse;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class Proxy implements
             MethodCallVerifyDomainProxy {
@@ -48,8 +51,8 @@ public class Proxy implements
      * a different proxy URL than the one provided. It can also be used to re-validate a domain that is already configured to work with a proxy.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.VerifyDomainProxyRequestBuilder verifyDomain() {
-        return new com.clerk.backend_api.models.operations.VerifyDomainProxyRequestBuilder(this);
+    public VerifyDomainProxyRequestBuilder verifyDomain() {
+        return new VerifyDomainProxyRequestBuilder(this);
     }
 
     /**
@@ -65,9 +68,10 @@ public com.clerk.backend_api.models.operations.VerifyDomainProxyRequestBuilder v
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.VerifyDomainProxyResponse verifyDomainDirect() throws Exception {
+    public VerifyDomainProxyResponse verifyDomainDirect() throws Exception {
         return verifyDomain(Optional.empty());
     }
+    
     /**
      * Verify the proxy configuration for your domain
      * This endpoint can be used to validate that a proxy-enabled domain is operational.
@@ -82,18 +86,23 @@ public com.clerk.backend_api.models.operations.VerifyDomainProxyResponse verifyD
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.VerifyDomainProxyResponse verifyDomain(
-            Optional<? extends com.clerk.backend_api.models.operations.VerifyDomainProxyRequestBody> request) throws Exception {
+    public VerifyDomainProxyResponse verifyDomain(
+            Optional<? extends VerifyDomainProxyRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/proxy_checks");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.VerifyDomainProxyRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends VerifyDomainProxyRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -106,7 +115,10 @@ public com.clerk.backend_api.models.operations.VerifyDomainProxyResponse verifyD
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("VerifyDomainProxy", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "VerifyDomainProxy", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -114,18 +126,28 @@ public com.clerk.backend_api.models.operations.VerifyDomainProxyResponse verifyD
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("VerifyDomainProxy", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "VerifyDomainProxy",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("VerifyDomainProxy", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "VerifyDomainProxy",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("VerifyDomainProxy", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "VerifyDomainProxy",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -133,42 +155,42 @@ public com.clerk.backend_api.models.operations.VerifyDomainProxyResponse verifyD
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.VerifyDomainProxyResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.VerifyDomainProxyResponse
+        VerifyDomainProxyResponse.Builder _resBuilder = 
+            VerifyDomainProxyResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.VerifyDomainProxyResponse _res = _resBuilder.build();
+        VerifyDomainProxyResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.ProxyCheck _out = Utils.mapper().readValue(
+                ProxyCheck _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.ProxyCheck>() {});
-                _res.withProxyCheck(java.util.Optional.ofNullable(_out));
+                    new TypeReference<ProxyCheck>() {});
+                _res.withProxyCheck(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -177,13 +199,13 @@ public com.clerk.backend_api.models.operations.VerifyDomainProxyResponse verifyD
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/RedirectURLs.java b/src/main/java/com/clerk/backend_api/RedirectURLs.java
index d1995ec..4e5a654 100644
--- a/src/main/java/com/clerk/backend_api/RedirectURLs.java
+++ b/src/main/java/com/clerk/backend_api/RedirectURLs.java
@@ -4,27 +4,39 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.models.components.RedirectURL;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateRedirectURLRequestBody;
+import com.clerk.backend_api.models.operations.CreateRedirectURLRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateRedirectURLResponse;
+import com.clerk.backend_api.models.operations.DeleteRedirectURLRequest;
+import com.clerk.backend_api.models.operations.DeleteRedirectURLRequestBuilder;
+import com.clerk.backend_api.models.operations.DeleteRedirectURLResponse;
+import com.clerk.backend_api.models.operations.GetRedirectURLRequest;
+import com.clerk.backend_api.models.operations.GetRedirectURLRequestBuilder;
+import com.clerk.backend_api.models.operations.GetRedirectURLResponse;
+import com.clerk.backend_api.models.operations.ListRedirectURLsRequestBuilder;
+import com.clerk.backend_api.models.operations.ListRedirectURLsResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class RedirectURLs implements
             MethodCallListRedirectURLs,
@@ -44,8 +56,8 @@ public class RedirectURLs implements
      * Lists all whitelisted redirect_urls for the instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.ListRedirectURLsRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.ListRedirectURLsRequestBuilder(this);
+    public ListRedirectURLsRequestBuilder list() {
+        return new ListRedirectURLsRequestBuilder(this);
     }
 
     /**
@@ -54,7 +66,7 @@ public com.clerk.backend_api.models.operations.ListRedirectURLsRequestBuilder li
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListRedirectURLsResponse listDirect() throws Exception {
+    public ListRedirectURLsResponse listDirect() throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
@@ -72,7 +84,10 @@ public com.clerk.backend_api.models.operations.ListRedirectURLsResponse listDire
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("ListRedirectURLs", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "ListRedirectURLs", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -80,18 +95,28 @@ public com.clerk.backend_api.models.operations.ListRedirectURLsResponse listDire
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("ListRedirectURLs", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "ListRedirectURLs",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("ListRedirectURLs", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "ListRedirectURLs",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("ListRedirectURLs", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "ListRedirectURLs",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -99,28 +124,28 @@ public com.clerk.backend_api.models.operations.ListRedirectURLsResponse listDire
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.ListRedirectURLsResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.ListRedirectURLsResponse
+        ListRedirectURLsResponse.Builder _resBuilder = 
+            ListRedirectURLsResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.ListRedirectURLsResponse _res = _resBuilder.build();
+        ListRedirectURLsResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                java.util.List<com.clerk.backend_api.models.components.RedirectURL> _out = Utils.mapper().readValue(
+                List<RedirectURL> _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<java.util.List<com.clerk.backend_api.models.components.RedirectURL>>() {});
-                _res.withRedirectURLList(java.util.Optional.ofNullable(_out));
+                    new TypeReference<List<RedirectURL>>() {});
+                _res.withRedirectURLList(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -129,13 +154,13 @@ public com.clerk.backend_api.models.operations.ListRedirectURLsResponse listDire
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -145,8 +170,8 @@ public com.clerk.backend_api.models.operations.ListRedirectURLsResponse listDire
      * Create a redirect URL
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateRedirectURLRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreateRedirectURLRequestBuilder(this);
+    public CreateRedirectURLRequestBuilder create() {
+        return new CreateRedirectURLRequestBuilder(this);
     }
 
     /**
@@ -155,9 +180,10 @@ public com.clerk.backend_api.models.operations.CreateRedirectURLRequestBuilder c
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateRedirectURLResponse createDirect() throws Exception {
+    public CreateRedirectURLResponse createDirect() throws Exception {
         return create(Optional.empty());
     }
+    
     /**
      * Create a redirect URL
      * Create a redirect URL
@@ -165,18 +191,23 @@ public com.clerk.backend_api.models.operations.CreateRedirectURLResponse createD
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateRedirectURLResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateRedirectURLRequestBody> request) throws Exception {
+    public CreateRedirectURLResponse create(
+            Optional<? extends CreateRedirectURLRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/redirect_urls");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.CreateRedirectURLRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends CreateRedirectURLRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -189,7 +220,10 @@ public com.clerk.backend_api.models.operations.CreateRedirectURLResponse create(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateRedirectURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateRedirectURL", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -197,18 +231,28 @@ public com.clerk.backend_api.models.operations.CreateRedirectURLResponse create(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateRedirectURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateRedirectURL",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateRedirectURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateRedirectURL",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateRedirectURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateRedirectURL",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -216,42 +260,42 @@ public com.clerk.backend_api.models.operations.CreateRedirectURLResponse create(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateRedirectURLResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateRedirectURLResponse
+        CreateRedirectURLResponse.Builder _resBuilder = 
+            CreateRedirectURLResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateRedirectURLResponse _res = _resBuilder.build();
+        CreateRedirectURLResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.RedirectURL _out = Utils.mapper().readValue(
+                RedirectURL _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.RedirectURL>() {});
-                _res.withRedirectURL(java.util.Optional.ofNullable(_out));
+                    new TypeReference<RedirectURL>() {});
+                _res.withRedirectURL(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -260,13 +304,13 @@ public com.clerk.backend_api.models.operations.CreateRedirectURLResponse create(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -276,8 +320,8 @@ public com.clerk.backend_api.models.operations.CreateRedirectURLResponse create(
      * Retrieve the details of the redirect URL with the given ID
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetRedirectURLRequestBuilder get() {
-        return new com.clerk.backend_api.models.operations.GetRedirectURLRequestBuilder(this);
+    public GetRedirectURLRequestBuilder get() {
+        return new GetRedirectURLRequestBuilder(this);
     }
 
     /**
@@ -287,17 +331,17 @@ public com.clerk.backend_api.models.operations.GetRedirectURLRequestBuilder get(
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetRedirectURLResponse get(
+    public GetRedirectURLResponse get(
             String id) throws Exception {
-        com.clerk.backend_api.models.operations.GetRedirectURLRequest request =
-            com.clerk.backend_api.models.operations.GetRedirectURLRequest
+        GetRedirectURLRequest request =
+            GetRedirectURLRequest
                 .builder()
                 .id(id)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.GetRedirectURLRequest.class,
+                GetRedirectURLRequest.class,
                 _baseUrl,
                 "/redirect_urls/{id}",
                 request, null);
@@ -314,7 +358,10 @@ public com.clerk.backend_api.models.operations.GetRedirectURLResponse get(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetRedirectURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetRedirectURL", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -322,18 +369,28 @@ public com.clerk.backend_api.models.operations.GetRedirectURLResponse get(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetRedirectURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetRedirectURL",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetRedirectURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetRedirectURL",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetRedirectURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetRedirectURL",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -341,42 +398,42 @@ public com.clerk.backend_api.models.operations.GetRedirectURLResponse get(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetRedirectURLResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetRedirectURLResponse
+        GetRedirectURLResponse.Builder _resBuilder = 
+            GetRedirectURLResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetRedirectURLResponse _res = _resBuilder.build();
+        GetRedirectURLResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.RedirectURL _out = Utils.mapper().readValue(
+                RedirectURL _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.RedirectURL>() {});
-                _res.withRedirectURL(java.util.Optional.ofNullable(_out));
+                    new TypeReference<RedirectURL>() {});
+                _res.withRedirectURL(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -385,13 +442,13 @@ public com.clerk.backend_api.models.operations.GetRedirectURLResponse get(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -401,8 +458,8 @@ public com.clerk.backend_api.models.operations.GetRedirectURLResponse get(
      * Remove the selected redirect URL from the whitelist of the instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeleteRedirectURLRequestBuilder delete() {
-        return new com.clerk.backend_api.models.operations.DeleteRedirectURLRequestBuilder(this);
+    public DeleteRedirectURLRequestBuilder delete() {
+        return new DeleteRedirectURLRequestBuilder(this);
     }
 
     /**
@@ -412,17 +469,17 @@ public com.clerk.backend_api.models.operations.DeleteRedirectURLRequestBuilder d
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeleteRedirectURLResponse delete(
+    public DeleteRedirectURLResponse delete(
             String id) throws Exception {
-        com.clerk.backend_api.models.operations.DeleteRedirectURLRequest request =
-            com.clerk.backend_api.models.operations.DeleteRedirectURLRequest
+        DeleteRedirectURLRequest request =
+            DeleteRedirectURLRequest
                 .builder()
                 .id(id)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DeleteRedirectURLRequest.class,
+                DeleteRedirectURLRequest.class,
                 _baseUrl,
                 "/redirect_urls/{id}",
                 request, null);
@@ -439,7 +496,10 @@ public com.clerk.backend_api.models.operations.DeleteRedirectURLResponse delete(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeleteRedirectURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeleteRedirectURL", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -447,18 +507,28 @@ public com.clerk.backend_api.models.operations.DeleteRedirectURLResponse delete(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeleteRedirectURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeleteRedirectURL",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeleteRedirectURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeleteRedirectURL",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeleteRedirectURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeleteRedirectURL",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -466,42 +536,42 @@ public com.clerk.backend_api.models.operations.DeleteRedirectURLResponse delete(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeleteRedirectURLResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeleteRedirectURLResponse
+        DeleteRedirectURLResponse.Builder _resBuilder = 
+            DeleteRedirectURLResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeleteRedirectURLResponse _res = _resBuilder.build();
+        DeleteRedirectURLResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.DeletedObject _out = Utils.mapper().readValue(
+                DeletedObject _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.DeletedObject>() {});
-                _res.withDeletedObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<DeletedObject>() {});
+                _res.withDeletedObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -510,13 +580,13 @@ public com.clerk.backend_api.models.operations.DeleteRedirectURLResponse delete(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/SDKConfiguration.java b/src/main/java/com/clerk/backend_api/SDKConfiguration.java
index cd1bd79..5cfe1fb 100644
--- a/src/main/java/com/clerk/backend_api/SDKConfiguration.java
+++ b/src/main/java/com/clerk/backend_api/SDKConfiguration.java
@@ -4,10 +4,12 @@
 
 package com.clerk.backend_api;
 
-import com.clerk.backend_api.utils.Hook.SdkInitData;
+import com.clerk.backend_api.hooks.SDKHooks;
 import com.clerk.backend_api.utils.HTTPClient;
+import com.clerk.backend_api.utils.Hook.SdkInitData;
+import com.clerk.backend_api.utils.Hooks;
 import com.clerk.backend_api.utils.RetryConfig;
-import com.clerk.backend_api.models.components.Security;
+import java.lang.String;
 import java.util.Optional;
 
 class SDKConfiguration {
@@ -17,26 +19,26 @@ public Optional<SecuritySource> securitySource() {
         return Optional.ofNullable(securitySource);
     }
     public HTTPClient defaultClient;
-      public String serverUrl;
+    public String serverUrl;
     public int serverIdx = 0;
     public String language = "java";
     public String openapiDocVersion = "v1";
-    public String sdkVersion = "0.2.0-beta.2";
-    public String genVersion = "2.387.0";
-    public String userAgent = "speakeasy-sdk/java 0.2.0-beta.2 2.387.0 v1 com.clerk.backend_api";
+    public String sdkVersion = "0.3.0-beta.2";
+    public String genVersion = "2.396.0";
+    public String userAgent = "speakeasy-sdk/java 0.3.0-beta.2 2.396.0 v1 com.clerk.backend_api";
 
-    private com.clerk.backend_api.utils.Hooks _hooks = createHooks();
+    private Hooks _hooks = createHooks();
 
-    private static com.clerk.backend_api.utils.Hooks createHooks() {
-        com.clerk.backend_api.utils.Hooks hooks = new com.clerk.backend_api.utils.Hooks();
+    private static Hooks createHooks() {
+        Hooks hooks = new Hooks();
         return hooks;
     }
     
-    public com.clerk.backend_api.utils.Hooks hooks() {
+    public Hooks hooks() {
         return _hooks;
     }
 
-    public void setHooks(com.clerk.backend_api.utils.Hooks hooks) {
+    public void setHooks(Hooks hooks) {
         this._hooks = hooks;
     }
 
@@ -44,7 +46,7 @@ public void setHooks(com.clerk.backend_api.utils.Hooks hooks) {
      * Initializes state (for example hooks).
      **/
     public void initialize() {
-        com.clerk.backend_api.hooks.SDKHooks.initialize(_hooks);
+        SDKHooks.initialize(_hooks);
         // apply the sdk init hook immediately
         SdkInitData data = _hooks.sdkInit(new SdkInitData(serverUrl, defaultClient));
         this.serverUrl = data.baseUrl();
diff --git a/src/main/java/com/clerk/backend_api/SamlConnections.java b/src/main/java/com/clerk/backend_api/SamlConnections.java
index 7e7ded6..96d3227 100644
--- a/src/main/java/com/clerk/backend_api/SamlConnections.java
+++ b/src/main/java/com/clerk/backend_api/SamlConnections.java
@@ -4,32 +4,50 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.models.components.SAMLConnection;
+import com.clerk.backend_api.models.components.SAMLConnections;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateSAMLConnectionRequestBody;
+import com.clerk.backend_api.models.operations.CreateSAMLConnectionRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse;
+import com.clerk.backend_api.models.operations.DeleteSAMLConnectionRequest;
+import com.clerk.backend_api.models.operations.DeleteSAMLConnectionRequestBuilder;
+import com.clerk.backend_api.models.operations.DeleteSAMLConnectionResponse;
+import com.clerk.backend_api.models.operations.GetSAMLConnectionRequest;
+import com.clerk.backend_api.models.operations.GetSAMLConnectionRequestBuilder;
+import com.clerk.backend_api.models.operations.GetSAMLConnectionResponse;
+import com.clerk.backend_api.models.operations.ListSAMLConnectionsRequest;
+import com.clerk.backend_api.models.operations.ListSAMLConnectionsRequestBuilder;
+import com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequest;
+import com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequestBody;
+import com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateSAMLConnectionResponse;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.ReadContext;
 import java.io.InputStream;
+import java.lang.Exception;
 import java.lang.Long;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Object;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.Optional;
-import org.apache.http.NameValuePair;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.Optional; 
 
 public class SamlConnections implements
             MethodCallListSAMLConnections,
@@ -52,8 +70,8 @@ public class SamlConnections implements
      * The SAML Connections are ordered by descending creation date and the most recent will be returned first.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.ListSAMLConnectionsRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.ListSAMLConnectionsRequestBuilder(this);
+    public ListSAMLConnectionsRequestBuilder list() {
+        return new ListSAMLConnectionsRequestBuilder(this);
     }
 
     /**
@@ -64,9 +82,10 @@ public com.clerk.backend_api.models.operations.ListSAMLConnectionsRequestBuilder
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse listDirect() throws Exception {
+    public ListSAMLConnectionsResponse listDirect() throws Exception {
         return list(Optional.empty(), Optional.empty());
     }
+    
     /**
      * Get a list of SAML Connections for an instance
      * Returns the list of SAML Connections for an instance.
@@ -80,11 +99,11 @@ public com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse listD
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse list(
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) throws Exception {
-        com.clerk.backend_api.models.operations.ListSAMLConnectionsRequest request =
-            com.clerk.backend_api.models.operations.ListSAMLConnectionsRequest
+    public ListSAMLConnectionsResponse list(
+            Optional<Long> limit,
+            Optional<Long> offset) throws Exception {
+        ListSAMLConnectionsRequest request =
+            ListSAMLConnectionsRequest
                 .builder()
                 .limit(limit)
                 .offset(offset)
@@ -101,7 +120,7 @@ public com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse list(
                 this.sdkConfiguration.userAgent);
 
         _req.addQueryParams(Utils.getQueryParams(
-                com.clerk.backend_api.models.operations.ListSAMLConnectionsRequest.class,
+                ListSAMLConnectionsRequest.class,
                 request, 
                 null));
 
@@ -112,7 +131,10 @@ public com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse list(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("ListSAMLConnections", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "ListSAMLConnections", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -120,18 +142,28 @@ public com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse list(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "403", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("ListSAMLConnections", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "ListSAMLConnections",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("ListSAMLConnections", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "ListSAMLConnections",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("ListSAMLConnections", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "ListSAMLConnections",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -139,11 +171,11 @@ public com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse list(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        byte[] _fullResponse = Utils.toByteArrayAndClose(_httpRes.body());
+        byte[] _fullResponse = Utils.extractByteArrayFromBody(_httpRes);
         
         @SuppressWarnings("deprecation")
-        com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse
+        ListSAMLConnectionsResponse.Builder _resBuilder = 
+            ListSAMLConnectionsResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
@@ -166,21 +198,21 @@ public com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse list(
                     if (_firstResult.size() < _resolvedLimit) {
                         return Optional.empty();
                     };
-                    long _newOffset = _requestOffset + _firstResult.size();
-                    com.clerk.backend_api.models.operations.ListSAMLConnectionsRequestBuilder _ret = list();
+                    long _newOffset = _requestOffset + _firstResult.size(); 
+                    ListSAMLConnectionsRequestBuilder _ret = list();
                     _ret.limit(_resolvedLimit);
                     _ret.offset(_newOffset);
                     return Optional.of(_ret.call());
                 });
 
-        com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse _res = _resBuilder.build();
+        ListSAMLConnectionsResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.SAMLConnections _out = Utils.mapper().readValue(
+                SAMLConnections _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
-                    new TypeReference<com.clerk.backend_api.models.components.SAMLConnections>() {});
-                _res.withSAMLConnections(java.util.Optional.ofNullable(_out));
+                    new TypeReference<SAMLConnections>() {});
+                _res.withSAMLConnections(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
@@ -192,9 +224,9 @@ public com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse list(
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "403", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
@@ -226,8 +258,8 @@ public com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse list(
      * Create a new SAML Connection.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateSAMLConnectionRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreateSAMLConnectionRequestBuilder(this);
+    public CreateSAMLConnectionRequestBuilder create() {
+        return new CreateSAMLConnectionRequestBuilder(this);
     }
 
     /**
@@ -236,9 +268,10 @@ public com.clerk.backend_api.models.operations.CreateSAMLConnectionRequestBuilde
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse createDirect() throws Exception {
+    public CreateSAMLConnectionResponse createDirect() throws Exception {
         return create(Optional.empty());
     }
+    
     /**
      * Create a SAML Connection
      * Create a new SAML Connection.
@@ -246,18 +279,23 @@ public com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse crea
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateSAMLConnectionRequestBody> request) throws Exception {
+    public CreateSAMLConnectionResponse create(
+            Optional<? extends CreateSAMLConnectionRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/saml_connections");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.CreateSAMLConnectionRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends CreateSAMLConnectionRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -270,7 +308,10 @@ public com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse crea
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateSAMLConnection", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -278,18 +319,28 @@ public com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse crea
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "403", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateSAMLConnection",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateSAMLConnection",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateSAMLConnection",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -297,42 +348,42 @@ public com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse crea
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse
+        CreateSAMLConnectionResponse.Builder _resBuilder = 
+            CreateSAMLConnectionResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse _res = _resBuilder.build();
+        CreateSAMLConnectionResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.SAMLConnection _out = Utils.mapper().readValue(
+                SAMLConnection _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.SAMLConnection>() {});
-                _res.withSAMLConnection(java.util.Optional.ofNullable(_out));
+                    new TypeReference<SAMLConnection>() {});
+                _res.withSAMLConnection(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "403", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -341,13 +392,13 @@ public com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse crea
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -357,8 +408,8 @@ public com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse crea
      * Fetches the SAML Connection whose ID matches the provided `saml_connection_id` in the path.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetSAMLConnectionRequestBuilder get() {
-        return new com.clerk.backend_api.models.operations.GetSAMLConnectionRequestBuilder(this);
+    public GetSAMLConnectionRequestBuilder get() {
+        return new GetSAMLConnectionRequestBuilder(this);
     }
 
     /**
@@ -368,17 +419,17 @@ public com.clerk.backend_api.models.operations.GetSAMLConnectionRequestBuilder g
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetSAMLConnectionResponse get(
+    public GetSAMLConnectionResponse get(
             String samlConnectionId) throws Exception {
-        com.clerk.backend_api.models.operations.GetSAMLConnectionRequest request =
-            com.clerk.backend_api.models.operations.GetSAMLConnectionRequest
+        GetSAMLConnectionRequest request =
+            GetSAMLConnectionRequest
                 .builder()
                 .samlConnectionId(samlConnectionId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.GetSAMLConnectionRequest.class,
+                GetSAMLConnectionRequest.class,
                 _baseUrl,
                 "/saml_connections/{saml_connection_id}",
                 request, null);
@@ -395,7 +446,10 @@ public com.clerk.backend_api.models.operations.GetSAMLConnectionResponse get(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetSAMLConnection", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -403,18 +457,28 @@ public com.clerk.backend_api.models.operations.GetSAMLConnectionResponse get(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetSAMLConnection",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetSAMLConnection",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetSAMLConnection",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -422,42 +486,42 @@ public com.clerk.backend_api.models.operations.GetSAMLConnectionResponse get(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetSAMLConnectionResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetSAMLConnectionResponse
+        GetSAMLConnectionResponse.Builder _resBuilder = 
+            GetSAMLConnectionResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetSAMLConnectionResponse _res = _resBuilder.build();
+        GetSAMLConnectionResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.SAMLConnection _out = Utils.mapper().readValue(
+                SAMLConnection _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.SAMLConnection>() {});
-                _res.withSAMLConnection(java.util.Optional.ofNullable(_out));
+                    new TypeReference<SAMLConnection>() {});
+                _res.withSAMLConnection(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -466,13 +530,13 @@ public com.clerk.backend_api.models.operations.GetSAMLConnectionResponse get(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -482,8 +546,8 @@ public com.clerk.backend_api.models.operations.GetSAMLConnectionResponse get(
      * Updates the SAML Connection whose ID matches the provided `id` in the path.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequestBuilder update() {
-        return new com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequestBuilder(this);
+    public UpdateSAMLConnectionRequestBuilder update() {
+        return new UpdateSAMLConnectionRequestBuilder(this);
     }
 
     /**
@@ -494,11 +558,11 @@ public com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequestBuilde
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateSAMLConnectionResponse update(
+    public UpdateSAMLConnectionResponse update(
             String samlConnectionId,
-            com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequestBody requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequest request =
-            com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequest
+            UpdateSAMLConnectionRequestBody requestBody) throws Exception {
+        UpdateSAMLConnectionRequest request =
+            UpdateSAMLConnectionRequest
                 .builder()
                 .samlConnectionId(samlConnectionId)
                 .requestBody(requestBody)
@@ -506,16 +570,21 @@ public com.clerk.backend_api.models.operations.UpdateSAMLConnectionResponse upda
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequest.class,
+                UpdateSAMLConnectionRequest.class,
                 _baseUrl,
                 "/saml_connections/{saml_connection_id}",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         if (_serializedRequestBody == null) {
             throw new Exception("Request body is required");
         }
@@ -531,7 +600,10 @@ public com.clerk.backend_api.models.operations.UpdateSAMLConnectionResponse upda
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateSAMLConnection", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -539,18 +611,28 @@ public com.clerk.backend_api.models.operations.UpdateSAMLConnectionResponse upda
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "403", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateSAMLConnection",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateSAMLConnection",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateSAMLConnection",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -558,42 +640,42 @@ public com.clerk.backend_api.models.operations.UpdateSAMLConnectionResponse upda
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateSAMLConnectionResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateSAMLConnectionResponse
+        UpdateSAMLConnectionResponse.Builder _resBuilder = 
+            UpdateSAMLConnectionResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateSAMLConnectionResponse _res = _resBuilder.build();
+        UpdateSAMLConnectionResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.SAMLConnection _out = Utils.mapper().readValue(
+                SAMLConnection _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.SAMLConnection>() {});
-                _res.withSAMLConnection(java.util.Optional.ofNullable(_out));
+                    new TypeReference<SAMLConnection>() {});
+                _res.withSAMLConnection(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "403", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -602,13 +684,13 @@ public com.clerk.backend_api.models.operations.UpdateSAMLConnectionResponse upda
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -618,8 +700,8 @@ public com.clerk.backend_api.models.operations.UpdateSAMLConnectionResponse upda
      * Deletes the SAML Connection whose ID matches the provided `id` in the path.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeleteSAMLConnectionRequestBuilder delete() {
-        return new com.clerk.backend_api.models.operations.DeleteSAMLConnectionRequestBuilder(this);
+    public DeleteSAMLConnectionRequestBuilder delete() {
+        return new DeleteSAMLConnectionRequestBuilder(this);
     }
 
     /**
@@ -629,17 +711,17 @@ public com.clerk.backend_api.models.operations.DeleteSAMLConnectionRequestBuilde
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeleteSAMLConnectionResponse delete(
+    public DeleteSAMLConnectionResponse delete(
             String samlConnectionId) throws Exception {
-        com.clerk.backend_api.models.operations.DeleteSAMLConnectionRequest request =
-            com.clerk.backend_api.models.operations.DeleteSAMLConnectionRequest
+        DeleteSAMLConnectionRequest request =
+            DeleteSAMLConnectionRequest
                 .builder()
                 .samlConnectionId(samlConnectionId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DeleteSAMLConnectionRequest.class,
+                DeleteSAMLConnectionRequest.class,
                 _baseUrl,
                 "/saml_connections/{saml_connection_id}",
                 request, null);
@@ -656,7 +738,10 @@ public com.clerk.backend_api.models.operations.DeleteSAMLConnectionResponse dele
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeleteSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeleteSAMLConnection", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -664,18 +749,28 @@ public com.clerk.backend_api.models.operations.DeleteSAMLConnectionResponse dele
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "403", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeleteSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeleteSAMLConnection",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeleteSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeleteSAMLConnection",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeleteSAMLConnection", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeleteSAMLConnection",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -683,42 +778,42 @@ public com.clerk.backend_api.models.operations.DeleteSAMLConnectionResponse dele
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeleteSAMLConnectionResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeleteSAMLConnectionResponse
+        DeleteSAMLConnectionResponse.Builder _resBuilder = 
+            DeleteSAMLConnectionResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeleteSAMLConnectionResponse _res = _resBuilder.build();
+        DeleteSAMLConnectionResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.DeletedObject _out = Utils.mapper().readValue(
+                DeletedObject _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.DeletedObject>() {});
-                _res.withDeletedObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<DeletedObject>() {});
+                _res.withDeletedObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "403", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -727,13 +822,13 @@ public com.clerk.backend_api.models.operations.DeleteSAMLConnectionResponse dele
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/Sessions.java b/src/main/java/com/clerk/backend_api/Sessions.java
index d37fb36..8cee720 100644
--- a/src/main/java/com/clerk/backend_api/Sessions.java
+++ b/src/main/java/com/clerk/backend_api/Sessions.java
@@ -4,28 +4,45 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.Session;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateRequest;
+import com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateResponse;
+import com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateResponseBody;
+import com.clerk.backend_api.models.operations.GetSessionListRequest;
+import com.clerk.backend_api.models.operations.GetSessionListRequestBuilder;
+import com.clerk.backend_api.models.operations.GetSessionListResponse;
+import com.clerk.backend_api.models.operations.GetSessionRequest;
+import com.clerk.backend_api.models.operations.GetSessionRequestBuilder;
+import com.clerk.backend_api.models.operations.GetSessionResponse;
+import com.clerk.backend_api.models.operations.RevokeSessionRequest;
+import com.clerk.backend_api.models.operations.RevokeSessionRequestBuilder;
+import com.clerk.backend_api.models.operations.RevokeSessionResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.VerifySessionRequest;
+import com.clerk.backend_api.models.operations.VerifySessionRequestBody;
+import com.clerk.backend_api.models.operations.VerifySessionRequestBuilder;
+import com.clerk.backend_api.models.operations.VerifySessionResponse;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Deprecated;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.apache.http.NameValuePair;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class Sessions implements
             MethodCallGetSessionList,
@@ -49,8 +66,8 @@ public class Sessions implements
      * moving forward at least one of `client_id` or `user_id` parameters should be provided.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetSessionListRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.GetSessionListRequestBuilder(this);
+    public GetSessionListRequestBuilder list() {
+        return new GetSessionListRequestBuilder(this);
     }
 
     /**
@@ -63,8 +80,8 @@ public com.clerk.backend_api.models.operations.GetSessionListRequestBuilder list
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetSessionListResponse list(
-            com.clerk.backend_api.models.operations.GetSessionListRequest request) throws Exception {
+    public GetSessionListResponse list(
+            GetSessionListRequest request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
@@ -76,7 +93,7 @@ public com.clerk.backend_api.models.operations.GetSessionListResponse list(
                 this.sdkConfiguration.userAgent);
 
         _req.addQueryParams(Utils.getQueryParams(
-                com.clerk.backend_api.models.operations.GetSessionListRequest.class,
+                GetSessionListRequest.class,
                 request, 
                 null));
 
@@ -87,7 +104,10 @@ public com.clerk.backend_api.models.operations.GetSessionListResponse list(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetSessionList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetSessionList", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -95,18 +115,28 @@ public com.clerk.backend_api.models.operations.GetSessionListResponse list(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetSessionList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetSessionList",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetSessionList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetSessionList",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetSessionList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetSessionList",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -114,42 +144,42 @@ public com.clerk.backend_api.models.operations.GetSessionListResponse list(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetSessionListResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetSessionListResponse
+        GetSessionListResponse.Builder _resBuilder = 
+            GetSessionListResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetSessionListResponse _res = _resBuilder.build();
+        GetSessionListResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                java.util.List<com.clerk.backend_api.models.components.Session> _out = Utils.mapper().readValue(
+                List<Session> _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<java.util.List<com.clerk.backend_api.models.components.Session>>() {});
-                _res.withSessionList(java.util.Optional.ofNullable(_out));
+                    new TypeReference<List<Session>>() {});
+                _res.withSessionList(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -158,13 +188,13 @@ public com.clerk.backend_api.models.operations.GetSessionListResponse list(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -174,8 +204,8 @@ public com.clerk.backend_api.models.operations.GetSessionListResponse list(
      * Retrieve the details of a session
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetSessionRequestBuilder get() {
-        return new com.clerk.backend_api.models.operations.GetSessionRequestBuilder(this);
+    public GetSessionRequestBuilder get() {
+        return new GetSessionRequestBuilder(this);
     }
 
     /**
@@ -185,17 +215,17 @@ public com.clerk.backend_api.models.operations.GetSessionRequestBuilder get() {
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetSessionResponse get(
+    public GetSessionResponse get(
             String sessionId) throws Exception {
-        com.clerk.backend_api.models.operations.GetSessionRequest request =
-            com.clerk.backend_api.models.operations.GetSessionRequest
+        GetSessionRequest request =
+            GetSessionRequest
                 .builder()
                 .sessionId(sessionId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.GetSessionRequest.class,
+                GetSessionRequest.class,
                 _baseUrl,
                 "/sessions/{session_id}",
                 request, null);
@@ -212,7 +242,10 @@ public com.clerk.backend_api.models.operations.GetSessionResponse get(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetSession", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetSession", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -220,18 +253,28 @@ public com.clerk.backend_api.models.operations.GetSessionResponse get(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetSession", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetSession",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetSession", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetSession",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetSession", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetSession",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -239,42 +282,42 @@ public com.clerk.backend_api.models.operations.GetSessionResponse get(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetSessionResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetSessionResponse
+        GetSessionResponse.Builder _resBuilder = 
+            GetSessionResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetSessionResponse _res = _resBuilder.build();
+        GetSessionResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Session _out = Utils.mapper().readValue(
+                Session _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Session>() {});
-                _res.withSession(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Session>() {});
+                _res.withSession(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -283,13 +326,13 @@ public com.clerk.backend_api.models.operations.GetSessionResponse get(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -300,8 +343,8 @@ public com.clerk.backend_api.models.operations.GetSessionResponse get(
      * In multi-session mode, a revoked session will still be returned along with its client object, however the user will need to sign in again.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.RevokeSessionRequestBuilder revoke() {
-        return new com.clerk.backend_api.models.operations.RevokeSessionRequestBuilder(this);
+    public RevokeSessionRequestBuilder revoke() {
+        return new RevokeSessionRequestBuilder(this);
     }
 
     /**
@@ -312,17 +355,17 @@ public com.clerk.backend_api.models.operations.RevokeSessionRequestBuilder revok
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.RevokeSessionResponse revoke(
+    public RevokeSessionResponse revoke(
             String sessionId) throws Exception {
-        com.clerk.backend_api.models.operations.RevokeSessionRequest request =
-            com.clerk.backend_api.models.operations.RevokeSessionRequest
+        RevokeSessionRequest request =
+            RevokeSessionRequest
                 .builder()
                 .sessionId(sessionId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.RevokeSessionRequest.class,
+                RevokeSessionRequest.class,
                 _baseUrl,
                 "/sessions/{session_id}/revoke",
                 request, null);
@@ -339,7 +382,10 @@ public com.clerk.backend_api.models.operations.RevokeSessionResponse revoke(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("RevokeSession", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "RevokeSession", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -347,18 +393,28 @@ public com.clerk.backend_api.models.operations.RevokeSessionResponse revoke(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("RevokeSession", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "RevokeSession",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("RevokeSession", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "RevokeSession",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("RevokeSession", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "RevokeSession",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -366,42 +422,42 @@ public com.clerk.backend_api.models.operations.RevokeSessionResponse revoke(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.RevokeSessionResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.RevokeSessionResponse
+        RevokeSessionResponse.Builder _resBuilder = 
+            RevokeSessionResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.RevokeSessionResponse _res = _resBuilder.build();
+        RevokeSessionResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Session _out = Utils.mapper().readValue(
+                Session _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Session>() {});
-                _res.withSession(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Session>() {});
+                _res.withSession(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -410,13 +466,13 @@ public com.clerk.backend_api.models.operations.RevokeSessionResponse revoke(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -431,8 +487,8 @@ public com.clerk.backend_api.models.operations.RevokeSessionResponse revoke(
      * @deprecated method: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public com.clerk.backend_api.models.operations.VerifySessionRequestBuilder verify() {
-        return new com.clerk.backend_api.models.operations.VerifySessionRequestBuilder(this);
+    public VerifySessionRequestBuilder verify() {
+        return new VerifySessionRequestBuilder(this);
     }
 
     /**
@@ -447,10 +503,11 @@ public com.clerk.backend_api.models.operations.VerifySessionRequestBuilder verif
      * @deprecated method: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public com.clerk.backend_api.models.operations.VerifySessionResponse verify(
+    public VerifySessionResponse verify(
             String sessionId) throws Exception {
         return verify(sessionId, Optional.empty());
     }
+    
     /**
      * Verify a session
      * Returns the session if it is authenticated, otherwise returns an error.
@@ -464,11 +521,11 @@ public com.clerk.backend_api.models.operations.VerifySessionResponse verify(
      * @deprecated method: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public com.clerk.backend_api.models.operations.VerifySessionResponse verify(
+    public VerifySessionResponse verify(
             String sessionId,
-            Optional<? extends com.clerk.backend_api.models.operations.VerifySessionRequestBody> requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.VerifySessionRequest request =
-            com.clerk.backend_api.models.operations.VerifySessionRequest
+            Optional<? extends VerifySessionRequestBody> requestBody) throws Exception {
+        VerifySessionRequest request =
+            VerifySessionRequest
                 .builder()
                 .sessionId(sessionId)
                 .requestBody(requestBody)
@@ -476,16 +533,21 @@ public com.clerk.backend_api.models.operations.VerifySessionResponse verify(
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.VerifySessionRequest.class,
+                VerifySessionRequest.class,
                 _baseUrl,
                 "/sessions/{session_id}/verify",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -498,7 +560,10 @@ public com.clerk.backend_api.models.operations.VerifySessionResponse verify(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("VerifySession", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "VerifySession", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -506,18 +571,28 @@ public com.clerk.backend_api.models.operations.VerifySessionResponse verify(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "410", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("VerifySession", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "VerifySession",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("VerifySession", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "VerifySession",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("VerifySession", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "VerifySession",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -525,42 +600,42 @@ public com.clerk.backend_api.models.operations.VerifySessionResponse verify(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.VerifySessionResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.VerifySessionResponse
+        VerifySessionResponse.Builder _resBuilder = 
+            VerifySessionResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.VerifySessionResponse _res = _resBuilder.build();
+        VerifySessionResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Session _out = Utils.mapper().readValue(
+                Session _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Session>() {});
-                _res.withSession(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Session>() {});
+                _res.withSession(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "410")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -569,13 +644,13 @@ public com.clerk.backend_api.models.operations.VerifySessionResponse verify(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -585,8 +660,8 @@ public com.clerk.backend_api.models.operations.VerifySessionResponse verify(
      * Creates a JSON Web Token(JWT) based on a session and a JWT Template name defined for your instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateRequestBuilder createTokenFromTemplate() {
-        return new com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateRequestBuilder(this);
+    public CreateSessionTokenFromTemplateRequestBuilder createTokenFromTemplate() {
+        return new CreateSessionTokenFromTemplateRequestBuilder(this);
     }
 
     /**
@@ -597,11 +672,11 @@ public com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateReq
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateResponse createTokenFromTemplate(
+    public CreateSessionTokenFromTemplateResponse createTokenFromTemplate(
             String sessionId,
             String templateName) throws Exception {
-        com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateRequest request =
-            com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateRequest
+        CreateSessionTokenFromTemplateRequest request =
+            CreateSessionTokenFromTemplateRequest
                 .builder()
                 .sessionId(sessionId)
                 .templateName(templateName)
@@ -609,7 +684,7 @@ public com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateRes
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateRequest.class,
+                CreateSessionTokenFromTemplateRequest.class,
                 _baseUrl,
                 "/sessions/{session_id}/tokens/{template_name}",
                 request, null);
@@ -626,7 +701,10 @@ public com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateRes
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateSessionTokenFromTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateSessionTokenFromTemplate", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -634,18 +712,28 @@ public com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateRes
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "401", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateSessionTokenFromTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateSessionTokenFromTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateSessionTokenFromTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateSessionTokenFromTemplate",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateSessionTokenFromTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateSessionTokenFromTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -653,42 +741,42 @@ public com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateRes
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateResponse
+        CreateSessionTokenFromTemplateResponse.Builder _resBuilder = 
+            CreateSessionTokenFromTemplateResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateResponse _res = _resBuilder.build();
+        CreateSessionTokenFromTemplateResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateResponseBody _out = Utils.mapper().readValue(
+                CreateSessionTokenFromTemplateResponseBody _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateResponseBody>() {});
-                _res.withObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<CreateSessionTokenFromTemplateResponseBody>() {});
+                _res.withObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "401", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -697,13 +785,13 @@ public com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateRes
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/SignInTokens.java b/src/main/java/com/clerk/backend_api/SignInTokens.java
index 05ef2eb..28b4b29 100644
--- a/src/main/java/com/clerk/backend_api/SignInTokens.java
+++ b/src/main/java/com/clerk/backend_api/SignInTokens.java
@@ -4,27 +4,33 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.SignInToken;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateSignInTokenRequestBody;
+import com.clerk.backend_api.models.operations.CreateSignInTokenRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateSignInTokenResponse;
+import com.clerk.backend_api.models.operations.RevokeSignInTokenRequest;
+import com.clerk.backend_api.models.operations.RevokeSignInTokenRequestBuilder;
+import com.clerk.backend_api.models.operations.RevokeSignInTokenResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class SignInTokens implements
             MethodCallCreateSignInToken,
@@ -44,8 +50,8 @@ public class SignInTokens implements
      * You can optionally supply a different duration in seconds using the `expires_in_seconds` property.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateSignInTokenRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreateSignInTokenRequestBuilder(this);
+    public CreateSignInTokenRequestBuilder create() {
+        return new CreateSignInTokenRequestBuilder(this);
     }
 
     /**
@@ -56,9 +62,10 @@ public com.clerk.backend_api.models.operations.CreateSignInTokenRequestBuilder c
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateSignInTokenResponse createDirect() throws Exception {
+    public CreateSignInTokenResponse createDirect() throws Exception {
         return create(Optional.empty());
     }
+    
     /**
      * Create sign-in token
      * Creates a new sign-in token and associates it with the given user.
@@ -68,18 +75,23 @@ public com.clerk.backend_api.models.operations.CreateSignInTokenResponse createD
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateSignInTokenResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateSignInTokenRequestBody> request) throws Exception {
+    public CreateSignInTokenResponse create(
+            Optional<? extends CreateSignInTokenRequestBody> request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/sign_in_tokens");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<Optional<? extends com.clerk.backend_api.models.operations.CreateSignInTokenRequestBody>>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Optional<? extends CreateSignInTokenRequestBody>>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -92,7 +104,10 @@ public com.clerk.backend_api.models.operations.CreateSignInTokenResponse create(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateSignInToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateSignInToken", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -100,18 +115,28 @@ public com.clerk.backend_api.models.operations.CreateSignInTokenResponse create(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateSignInToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateSignInToken",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateSignInToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateSignInToken",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateSignInToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateSignInToken",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -119,42 +144,42 @@ public com.clerk.backend_api.models.operations.CreateSignInTokenResponse create(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateSignInTokenResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateSignInTokenResponse
+        CreateSignInTokenResponse.Builder _resBuilder = 
+            CreateSignInTokenResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateSignInTokenResponse _res = _resBuilder.build();
+        CreateSignInTokenResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.SignInToken _out = Utils.mapper().readValue(
+                SignInToken _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.SignInToken>() {});
-                _res.withSignInToken(java.util.Optional.ofNullable(_out));
+                    new TypeReference<SignInToken>() {});
+                _res.withSignInToken(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -163,13 +188,13 @@ public com.clerk.backend_api.models.operations.CreateSignInTokenResponse create(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -179,8 +204,8 @@ public com.clerk.backend_api.models.operations.CreateSignInTokenResponse create(
      * Revokes a pending sign-in token
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.RevokeSignInTokenRequestBuilder revoke() {
-        return new com.clerk.backend_api.models.operations.RevokeSignInTokenRequestBuilder(this);
+    public RevokeSignInTokenRequestBuilder revoke() {
+        return new RevokeSignInTokenRequestBuilder(this);
     }
 
     /**
@@ -190,17 +215,17 @@ public com.clerk.backend_api.models.operations.RevokeSignInTokenRequestBuilder r
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.RevokeSignInTokenResponse revoke(
+    public RevokeSignInTokenResponse revoke(
             String signInTokenId) throws Exception {
-        com.clerk.backend_api.models.operations.RevokeSignInTokenRequest request =
-            com.clerk.backend_api.models.operations.RevokeSignInTokenRequest
+        RevokeSignInTokenRequest request =
+            RevokeSignInTokenRequest
                 .builder()
                 .signInTokenId(signInTokenId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.RevokeSignInTokenRequest.class,
+                RevokeSignInTokenRequest.class,
                 _baseUrl,
                 "/sign_in_tokens/{sign_in_token_id}/revoke",
                 request, null);
@@ -217,7 +242,10 @@ public com.clerk.backend_api.models.operations.RevokeSignInTokenResponse revoke(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("RevokeSignInToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "RevokeSignInToken", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -225,18 +253,28 @@ public com.clerk.backend_api.models.operations.RevokeSignInTokenResponse revoke(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("RevokeSignInToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "RevokeSignInToken",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("RevokeSignInToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "RevokeSignInToken",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("RevokeSignInToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "RevokeSignInToken",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -244,42 +282,42 @@ public com.clerk.backend_api.models.operations.RevokeSignInTokenResponse revoke(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.RevokeSignInTokenResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.RevokeSignInTokenResponse
+        RevokeSignInTokenResponse.Builder _resBuilder = 
+            RevokeSignInTokenResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.RevokeSignInTokenResponse _res = _resBuilder.build();
+        RevokeSignInTokenResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.SignInToken _out = Utils.mapper().readValue(
+                SignInToken _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.SignInToken>() {});
-                _res.withSignInToken(java.util.Optional.ofNullable(_out));
+                    new TypeReference<SignInToken>() {});
+                _res.withSignInToken(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -288,13 +326,13 @@ public com.clerk.backend_api.models.operations.RevokeSignInTokenResponse revoke(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/SignUps.java b/src/main/java/com/clerk/backend_api/SignUps.java
index 57cbdc2..21a258a 100644
--- a/src/main/java/com/clerk/backend_api/SignUps.java
+++ b/src/main/java/com/clerk/backend_api/SignUps.java
@@ -4,27 +4,31 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.SignUp;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.UpdateSignUpRequest;
+import com.clerk.backend_api.models.operations.UpdateSignUpRequestBody;
+import com.clerk.backend_api.models.operations.UpdateSignUpRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateSignUpResponse;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class SignUps implements
             MethodCallUpdateSignUp {
@@ -41,8 +45,8 @@ public class SignUps implements
      * Update the sign-up with the given ID
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateSignUpRequestBuilder update() {
-        return new com.clerk.backend_api.models.operations.UpdateSignUpRequestBuilder(this);
+    public UpdateSignUpRequestBuilder update() {
+        return new UpdateSignUpRequestBuilder(this);
     }
 
     /**
@@ -52,10 +56,11 @@ public com.clerk.backend_api.models.operations.UpdateSignUpRequestBuilder update
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateSignUpResponse update(
+    public UpdateSignUpResponse update(
             String id) throws Exception {
         return update(id, Optional.empty());
     }
+    
     /**
      * Update a sign-up
      * Update the sign-up with the given ID
@@ -64,11 +69,11 @@ public com.clerk.backend_api.models.operations.UpdateSignUpResponse update(
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateSignUpResponse update(
+    public UpdateSignUpResponse update(
             String id,
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateSignUpRequestBody> requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.UpdateSignUpRequest request =
-            com.clerk.backend_api.models.operations.UpdateSignUpRequest
+            Optional<? extends UpdateSignUpRequestBody> requestBody) throws Exception {
+        UpdateSignUpRequest request =
+            UpdateSignUpRequest
                 .builder()
                 .id(id)
                 .requestBody(requestBody)
@@ -76,16 +81,21 @@ public com.clerk.backend_api.models.operations.UpdateSignUpResponse update(
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UpdateSignUpRequest.class,
+                UpdateSignUpRequest.class,
                 _baseUrl,
                 "/sign_ups/{id}",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -98,7 +108,10 @@ public com.clerk.backend_api.models.operations.UpdateSignUpResponse update(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateSignUp", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateSignUp", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -106,18 +119,28 @@ public com.clerk.backend_api.models.operations.UpdateSignUpResponse update(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateSignUp", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateSignUp",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateSignUp", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateSignUp",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateSignUp", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateSignUp",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -125,42 +148,42 @@ public com.clerk.backend_api.models.operations.UpdateSignUpResponse update(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateSignUpResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateSignUpResponse
+        UpdateSignUpResponse.Builder _resBuilder = 
+            UpdateSignUpResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateSignUpResponse _res = _resBuilder.build();
+        UpdateSignUpResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.SignUp _out = Utils.mapper().readValue(
+                SignUp _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.SignUp>() {});
-                _res.withSignUp(java.util.Optional.ofNullable(_out));
+                    new TypeReference<SignUp>() {});
+                _res.withSignUp(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "403")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -169,13 +192,13 @@ public com.clerk.backend_api.models.operations.UpdateSignUpResponse update(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/Templates.java b/src/main/java/com/clerk/backend_api/Templates.java
index 98adb4a..27ec46f 100644
--- a/src/main/java/com/clerk/backend_api/Templates.java
+++ b/src/main/java/com/clerk/backend_api/Templates.java
@@ -4,27 +4,54 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.Template;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.GetTemplateListRequest;
+import com.clerk.backend_api.models.operations.GetTemplateListRequestBuilder;
+import com.clerk.backend_api.models.operations.GetTemplateListResponse;
+import com.clerk.backend_api.models.operations.GetTemplateRequest;
+import com.clerk.backend_api.models.operations.GetTemplateRequestBuilder;
+import com.clerk.backend_api.models.operations.GetTemplateResponse;
+import com.clerk.backend_api.models.operations.PathParamTemplateType;
+import com.clerk.backend_api.models.operations.PreviewTemplateRequest;
+import com.clerk.backend_api.models.operations.PreviewTemplateRequestBody;
+import com.clerk.backend_api.models.operations.PreviewTemplateRequestBuilder;
+import com.clerk.backend_api.models.operations.PreviewTemplateResponse;
+import com.clerk.backend_api.models.operations.PreviewTemplateResponseBody;
+import com.clerk.backend_api.models.operations.RevertTemplatePathParamTemplateType;
+import com.clerk.backend_api.models.operations.RevertTemplateRequest;
+import com.clerk.backend_api.models.operations.RevertTemplateRequestBuilder;
+import com.clerk.backend_api.models.operations.RevertTemplateResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.TemplateType;
+import com.clerk.backend_api.models.operations.ToggleTemplateDeliveryPathParamTemplateType;
+import com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequest;
+import com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequestBody;
+import com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequestBuilder;
+import com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse;
+import com.clerk.backend_api.models.operations.UpsertTemplatePathParamTemplateType;
+import com.clerk.backend_api.models.operations.UpsertTemplateRequest;
+import com.clerk.backend_api.models.operations.UpsertTemplateRequestBody;
+import com.clerk.backend_api.models.operations.UpsertTemplateRequestBuilder;
+import com.clerk.backend_api.models.operations.UpsertTemplateResponse;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Object;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class Templates implements
             MethodCallGetTemplateList,
@@ -47,8 +74,8 @@ public class Templates implements
      * The templates are returned sorted by position.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetTemplateListRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.GetTemplateListRequestBuilder(this);
+    public GetTemplateListRequestBuilder list() {
+        return new GetTemplateListRequestBuilder(this);
     }
 
     /**
@@ -59,17 +86,17 @@ public com.clerk.backend_api.models.operations.GetTemplateListRequestBuilder lis
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetTemplateListResponse list(
-            com.clerk.backend_api.models.operations.TemplateType templateType) throws Exception {
-        com.clerk.backend_api.models.operations.GetTemplateListRequest request =
-            com.clerk.backend_api.models.operations.GetTemplateListRequest
+    public GetTemplateListResponse list(
+            TemplateType templateType) throws Exception {
+        GetTemplateListRequest request =
+            GetTemplateListRequest
                 .builder()
                 .templateType(templateType)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.GetTemplateListRequest.class,
+                GetTemplateListRequest.class,
                 _baseUrl,
                 "/templates/{template_type}",
                 request, null);
@@ -86,7 +113,10 @@ public com.clerk.backend_api.models.operations.GetTemplateListResponse list(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetTemplateList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetTemplateList", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -94,18 +124,28 @@ public com.clerk.backend_api.models.operations.GetTemplateListResponse list(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetTemplateList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetTemplateList",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetTemplateList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetTemplateList",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetTemplateList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetTemplateList",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -113,42 +153,42 @@ public com.clerk.backend_api.models.operations.GetTemplateListResponse list(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetTemplateListResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetTemplateListResponse
+        GetTemplateListResponse.Builder _resBuilder = 
+            GetTemplateListResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetTemplateListResponse _res = _resBuilder.build();
+        GetTemplateListResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                java.util.List<com.clerk.backend_api.models.components.Template> _out = Utils.mapper().readValue(
+                List<Template> _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<java.util.List<com.clerk.backend_api.models.components.Template>>() {});
-                _res.withTemplateList(java.util.Optional.ofNullable(_out));
+                    new TypeReference<List<Template>>() {});
+                _res.withTemplateList(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -157,13 +197,13 @@ public com.clerk.backend_api.models.operations.GetTemplateListResponse list(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -173,8 +213,8 @@ public com.clerk.backend_api.models.operations.GetTemplateListResponse list(
      * Returns the details of a template
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetTemplateRequestBuilder get() {
-        return new com.clerk.backend_api.models.operations.GetTemplateRequestBuilder(this);
+    public GetTemplateRequestBuilder get() {
+        return new GetTemplateRequestBuilder(this);
     }
 
     /**
@@ -185,11 +225,11 @@ public com.clerk.backend_api.models.operations.GetTemplateRequestBuilder get() {
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetTemplateResponse get(
-            com.clerk.backend_api.models.operations.PathParamTemplateType templateType,
+    public GetTemplateResponse get(
+            PathParamTemplateType templateType,
             String slug) throws Exception {
-        com.clerk.backend_api.models.operations.GetTemplateRequest request =
-            com.clerk.backend_api.models.operations.GetTemplateRequest
+        GetTemplateRequest request =
+            GetTemplateRequest
                 .builder()
                 .templateType(templateType)
                 .slug(slug)
@@ -197,7 +237,7 @@ public com.clerk.backend_api.models.operations.GetTemplateResponse get(
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.GetTemplateRequest.class,
+                GetTemplateRequest.class,
                 _baseUrl,
                 "/templates/{template_type}/{slug}",
                 request, null);
@@ -214,7 +254,10 @@ public com.clerk.backend_api.models.operations.GetTemplateResponse get(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetTemplate", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -222,18 +265,28 @@ public com.clerk.backend_api.models.operations.GetTemplateResponse get(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetTemplate",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -241,42 +294,42 @@ public com.clerk.backend_api.models.operations.GetTemplateResponse get(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetTemplateResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetTemplateResponse
+        GetTemplateResponse.Builder _resBuilder = 
+            GetTemplateResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetTemplateResponse _res = _resBuilder.build();
+        GetTemplateResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Template _out = Utils.mapper().readValue(
+                Template _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Template>() {});
-                _res.withTemplate(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Template>() {});
+                _res.withTemplate(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -285,13 +338,13 @@ public com.clerk.backend_api.models.operations.GetTemplateResponse get(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -301,8 +354,8 @@ public com.clerk.backend_api.models.operations.GetTemplateResponse get(
      * Updates the existing template of the given type and slug
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpsertTemplateRequestBuilder upsert() {
-        return new com.clerk.backend_api.models.operations.UpsertTemplateRequestBuilder(this);
+    public UpsertTemplateRequestBuilder upsert() {
+        return new UpsertTemplateRequestBuilder(this);
     }
 
     /**
@@ -313,11 +366,12 @@ public com.clerk.backend_api.models.operations.UpsertTemplateRequestBuilder upse
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpsertTemplateResponse upsert(
-            com.clerk.backend_api.models.operations.UpsertTemplatePathParamTemplateType templateType,
+    public UpsertTemplateResponse upsert(
+            UpsertTemplatePathParamTemplateType templateType,
             String slug) throws Exception {
         return upsert(templateType, slug, Optional.empty());
     }
+    
     /**
      * Update a template for a given type and slug
      * Updates the existing template of the given type and slug
@@ -327,12 +381,12 @@ public com.clerk.backend_api.models.operations.UpsertTemplateResponse upsert(
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpsertTemplateResponse upsert(
-            com.clerk.backend_api.models.operations.UpsertTemplatePathParamTemplateType templateType,
+    public UpsertTemplateResponse upsert(
+            UpsertTemplatePathParamTemplateType templateType,
             String slug,
-            Optional<? extends com.clerk.backend_api.models.operations.UpsertTemplateRequestBody> requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.UpsertTemplateRequest request =
-            com.clerk.backend_api.models.operations.UpsertTemplateRequest
+            Optional<? extends UpsertTemplateRequestBody> requestBody) throws Exception {
+        UpsertTemplateRequest request =
+            UpsertTemplateRequest
                 .builder()
                 .templateType(templateType)
                 .slug(slug)
@@ -341,16 +395,21 @@ public com.clerk.backend_api.models.operations.UpsertTemplateResponse upsert(
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UpsertTemplateRequest.class,
+                UpsertTemplateRequest.class,
                 _baseUrl,
                 "/templates/{template_type}/{slug}",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PUT");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -363,7 +422,10 @@ public com.clerk.backend_api.models.operations.UpsertTemplateResponse upsert(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpsertTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpsertTemplate", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -371,18 +433,28 @@ public com.clerk.backend_api.models.operations.UpsertTemplateResponse upsert(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "402", "403", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpsertTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpsertTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpsertTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpsertTemplate",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpsertTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpsertTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -390,42 +462,42 @@ public com.clerk.backend_api.models.operations.UpsertTemplateResponse upsert(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpsertTemplateResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpsertTemplateResponse
+        UpsertTemplateResponse.Builder _resBuilder = 
+            UpsertTemplateResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpsertTemplateResponse _res = _resBuilder.build();
+        UpsertTemplateResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Template _out = Utils.mapper().readValue(
+                Template _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Template>() {});
-                _res.withTemplate(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Template>() {});
+                _res.withTemplate(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "402", "403", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -434,13 +506,13 @@ public com.clerk.backend_api.models.operations.UpsertTemplateResponse upsert(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -450,8 +522,8 @@ public com.clerk.backend_api.models.operations.UpsertTemplateResponse upsert(
      * Reverts an updated template to its default state
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.RevertTemplateRequestBuilder revert() {
-        return new com.clerk.backend_api.models.operations.RevertTemplateRequestBuilder(this);
+    public RevertTemplateRequestBuilder revert() {
+        return new RevertTemplateRequestBuilder(this);
     }
 
     /**
@@ -462,11 +534,11 @@ public com.clerk.backend_api.models.operations.RevertTemplateRequestBuilder reve
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.RevertTemplateResponse revert(
-            com.clerk.backend_api.models.operations.RevertTemplatePathParamTemplateType templateType,
+    public RevertTemplateResponse revert(
+            RevertTemplatePathParamTemplateType templateType,
             String slug) throws Exception {
-        com.clerk.backend_api.models.operations.RevertTemplateRequest request =
-            com.clerk.backend_api.models.operations.RevertTemplateRequest
+        RevertTemplateRequest request =
+            RevertTemplateRequest
                 .builder()
                 .templateType(templateType)
                 .slug(slug)
@@ -474,7 +546,7 @@ public com.clerk.backend_api.models.operations.RevertTemplateResponse revert(
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.RevertTemplateRequest.class,
+                RevertTemplateRequest.class,
                 _baseUrl,
                 "/templates/{template_type}/{slug}/revert",
                 request, null);
@@ -491,7 +563,10 @@ public com.clerk.backend_api.models.operations.RevertTemplateResponse revert(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("RevertTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "RevertTemplate", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -499,18 +574,28 @@ public com.clerk.backend_api.models.operations.RevertTemplateResponse revert(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "402", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("RevertTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "RevertTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("RevertTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "RevertTemplate",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("RevertTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "RevertTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -518,42 +603,42 @@ public com.clerk.backend_api.models.operations.RevertTemplateResponse revert(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.RevertTemplateResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.RevertTemplateResponse
+        RevertTemplateResponse.Builder _resBuilder = 
+            RevertTemplateResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.RevertTemplateResponse _res = _resBuilder.build();
+        RevertTemplateResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Template _out = Utils.mapper().readValue(
+                Template _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Template>() {});
-                _res.withTemplate(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Template>() {});
+                _res.withTemplate(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "402", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -562,13 +647,13 @@ public com.clerk.backend_api.models.operations.RevertTemplateResponse revert(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -578,8 +663,8 @@ public com.clerk.backend_api.models.operations.RevertTemplateResponse revert(
      * Returns a preview of a template for a given template_type, slug and body
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.PreviewTemplateRequestBuilder preview() {
-        return new com.clerk.backend_api.models.operations.PreviewTemplateRequestBuilder(this);
+    public PreviewTemplateRequestBuilder preview() {
+        return new PreviewTemplateRequestBuilder(this);
     }
 
     /**
@@ -590,11 +675,12 @@ public com.clerk.backend_api.models.operations.PreviewTemplateRequestBuilder pre
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.PreviewTemplateResponse preview(
+    public PreviewTemplateResponse preview(
             String templateType,
             String slug) throws Exception {
         return preview(templateType, slug, Optional.empty());
     }
+    
     /**
      * Preview changes to a template
      * Returns a preview of a template for a given template_type, slug and body
@@ -604,12 +690,12 @@ public com.clerk.backend_api.models.operations.PreviewTemplateResponse preview(
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.PreviewTemplateResponse preview(
+    public PreviewTemplateResponse preview(
             String templateType,
             String slug,
-            Optional<? extends com.clerk.backend_api.models.operations.PreviewTemplateRequestBody> requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.PreviewTemplateRequest request =
-            com.clerk.backend_api.models.operations.PreviewTemplateRequest
+            Optional<? extends PreviewTemplateRequestBody> requestBody) throws Exception {
+        PreviewTemplateRequest request =
+            PreviewTemplateRequest
                 .builder()
                 .templateType(templateType)
                 .slug(slug)
@@ -618,16 +704,21 @@ public com.clerk.backend_api.models.operations.PreviewTemplateResponse preview(
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.PreviewTemplateRequest.class,
+                PreviewTemplateRequest.class,
                 _baseUrl,
                 "/templates/{template_type}/{slug}/preview",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -640,7 +731,10 @@ public com.clerk.backend_api.models.operations.PreviewTemplateResponse preview(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("PreviewTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "PreviewTemplate", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -648,18 +742,28 @@ public com.clerk.backend_api.models.operations.PreviewTemplateResponse preview(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("PreviewTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "PreviewTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("PreviewTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "PreviewTemplate",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("PreviewTemplate", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "PreviewTemplate",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -667,42 +771,42 @@ public com.clerk.backend_api.models.operations.PreviewTemplateResponse preview(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.PreviewTemplateResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.PreviewTemplateResponse
+        PreviewTemplateResponse.Builder _resBuilder = 
+            PreviewTemplateResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.PreviewTemplateResponse _res = _resBuilder.build();
+        PreviewTemplateResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.operations.PreviewTemplateResponseBody _out = Utils.mapper().readValue(
+                PreviewTemplateResponseBody _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.operations.PreviewTemplateResponseBody>() {});
-                _res.withObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<PreviewTemplateResponseBody>() {});
+                _res.withObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -711,13 +815,13 @@ public com.clerk.backend_api.models.operations.PreviewTemplateResponse preview(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -729,8 +833,8 @@ public com.clerk.backend_api.models.operations.PreviewTemplateResponse preview(
      * The app developer will need to listen to the `email.created` or `sms.created` webhooks in order to handle delivery themselves.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequestBuilder toggleDelivery() {
-        return new com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequestBuilder(this);
+    public ToggleTemplateDeliveryRequestBuilder toggleDelivery() {
+        return new ToggleTemplateDeliveryRequestBuilder(this);
     }
 
     /**
@@ -743,11 +847,12 @@ public com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequestBuil
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse toggleDelivery(
-            com.clerk.backend_api.models.operations.ToggleTemplateDeliveryPathParamTemplateType templateType,
+    public ToggleTemplateDeliveryResponse toggleDelivery(
+            ToggleTemplateDeliveryPathParamTemplateType templateType,
             String slug) throws Exception {
         return toggleDelivery(templateType, slug, Optional.empty());
     }
+    
     /**
      * Toggle the delivery by Clerk for a template of a given type and slug
      * Toggles the delivery by Clerk for a template of a given type and slug.
@@ -759,12 +864,12 @@ public com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse to
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse toggleDelivery(
-            com.clerk.backend_api.models.operations.ToggleTemplateDeliveryPathParamTemplateType templateType,
+    public ToggleTemplateDeliveryResponse toggleDelivery(
+            ToggleTemplateDeliveryPathParamTemplateType templateType,
             String slug,
-            Optional<? extends com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequestBody> requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequest request =
-            com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequest
+            Optional<? extends ToggleTemplateDeliveryRequestBody> requestBody) throws Exception {
+        ToggleTemplateDeliveryRequest request =
+            ToggleTemplateDeliveryRequest
                 .builder()
                 .templateType(templateType)
                 .slug(slug)
@@ -773,16 +878,21 @@ public com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse to
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequest.class,
+                ToggleTemplateDeliveryRequest.class,
                 _baseUrl,
                 "/templates/{template_type}/{slug}/toggle_delivery",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -795,7 +905,10 @@ public com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse to
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("ToggleTemplateDelivery", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "ToggleTemplateDelivery", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -803,18 +916,28 @@ public com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse to
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("ToggleTemplateDelivery", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "ToggleTemplateDelivery",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("ToggleTemplateDelivery", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "ToggleTemplateDelivery",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("ToggleTemplateDelivery", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "ToggleTemplateDelivery",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -822,42 +945,42 @@ public com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse to
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse
+        ToggleTemplateDeliveryResponse.Builder _resBuilder = 
+            ToggleTemplateDeliveryResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse _res = _resBuilder.build();
+        ToggleTemplateDeliveryResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.Template _out = Utils.mapper().readValue(
+                Template _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.Template>() {});
-                _res.withTemplate(java.util.Optional.ofNullable(_out));
+                    new TypeReference<Template>() {});
+                _res.withTemplate(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -866,13 +989,13 @@ public com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse to
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/TestingTokens.java b/src/main/java/com/clerk/backend_api/TestingTokens.java
index 1609d26..e18065f 100644
--- a/src/main/java/com/clerk/backend_api/TestingTokens.java
+++ b/src/main/java/com/clerk/backend_api/TestingTokens.java
@@ -4,26 +4,25 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.TestingToken;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateTestingTokenRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateTestingTokenResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class TestingTokens implements
             MethodCallCreateTestingToken {
@@ -40,8 +39,8 @@ public class TestingTokens implements
      * Retrieve a new testing token. Only available for development instances.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateTestingTokenRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreateTestingTokenRequestBuilder(this);
+    public CreateTestingTokenRequestBuilder create() {
+        return new CreateTestingTokenRequestBuilder(this);
     }
 
     /**
@@ -50,7 +49,7 @@ public com.clerk.backend_api.models.operations.CreateTestingTokenRequestBuilder
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateTestingTokenResponse createDirect() throws Exception {
+    public CreateTestingTokenResponse createDirect() throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
@@ -68,7 +67,10 @@ public com.clerk.backend_api.models.operations.CreateTestingTokenResponse create
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateTestingToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateTestingToken", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -76,18 +78,28 @@ public com.clerk.backend_api.models.operations.CreateTestingTokenResponse create
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateTestingToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateTestingToken",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateTestingToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateTestingToken",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateTestingToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateTestingToken",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -95,28 +107,28 @@ public com.clerk.backend_api.models.operations.CreateTestingTokenResponse create
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateTestingTokenResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateTestingTokenResponse
+        CreateTestingTokenResponse.Builder _resBuilder = 
+            CreateTestingTokenResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateTestingTokenResponse _res = _resBuilder.build();
+        CreateTestingTokenResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.TestingToken _out = Utils.mapper().readValue(
+                TestingToken _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.TestingToken>() {});
-                _res.withTestingToken(java.util.Optional.ofNullable(_out));
+                    new TypeReference<TestingToken>() {});
+                _res.withTestingToken(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "4XX", "5XX")) {
@@ -125,13 +137,13 @@ public com.clerk.backend_api.models.operations.CreateTestingTokenResponse create
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/Users.java b/src/main/java/com/clerk/backend_api/Users.java
index 8c43245..a44a820 100644
--- a/src/main/java/com/clerk/backend_api/Users.java
+++ b/src/main/java/com/clerk/backend_api/Users.java
@@ -4,32 +4,98 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.models.components.OrganizationMemberships;
+import com.clerk.backend_api.models.components.TotalCount;
+import com.clerk.backend_api.models.components.User;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.BanUserRequest;
+import com.clerk.backend_api.models.operations.BanUserRequestBuilder;
+import com.clerk.backend_api.models.operations.BanUserResponse;
+import com.clerk.backend_api.models.operations.CreateUserRequestBody;
+import com.clerk.backend_api.models.operations.CreateUserRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateUserResponse;
+import com.clerk.backend_api.models.operations.DeleteUserProfileImageRequest;
+import com.clerk.backend_api.models.operations.DeleteUserProfileImageRequestBuilder;
+import com.clerk.backend_api.models.operations.DeleteUserProfileImageResponse;
+import com.clerk.backend_api.models.operations.DeleteUserRequest;
+import com.clerk.backend_api.models.operations.DeleteUserRequestBuilder;
+import com.clerk.backend_api.models.operations.DeleteUserResponse;
+import com.clerk.backend_api.models.operations.DisableMFARequest;
+import com.clerk.backend_api.models.operations.DisableMFARequestBuilder;
+import com.clerk.backend_api.models.operations.DisableMFAResponse;
+import com.clerk.backend_api.models.operations.DisableMFAResponseBody;
+import com.clerk.backend_api.models.operations.GetOAuthAccessTokenRequest;
+import com.clerk.backend_api.models.operations.GetOAuthAccessTokenRequestBuilder;
+import com.clerk.backend_api.models.operations.GetOAuthAccessTokenResponse;
+import com.clerk.backend_api.models.operations.GetUserListRequest;
+import com.clerk.backend_api.models.operations.GetUserListRequestBuilder;
+import com.clerk.backend_api.models.operations.GetUserListResponse;
+import com.clerk.backend_api.models.operations.GetUserRequest;
+import com.clerk.backend_api.models.operations.GetUserRequestBuilder;
+import com.clerk.backend_api.models.operations.GetUserResponse;
+import com.clerk.backend_api.models.operations.GetUsersCountRequest;
+import com.clerk.backend_api.models.operations.GetUsersCountRequestBuilder;
+import com.clerk.backend_api.models.operations.GetUsersCountResponse;
+import com.clerk.backend_api.models.operations.LockUserRequest;
+import com.clerk.backend_api.models.operations.LockUserRequestBuilder;
+import com.clerk.backend_api.models.operations.LockUserResponse;
+import com.clerk.backend_api.models.operations.ResponseBody;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
+import com.clerk.backend_api.models.operations.SetUserProfileImageRequest;
+import com.clerk.backend_api.models.operations.SetUserProfileImageRequestBody;
+import com.clerk.backend_api.models.operations.SetUserProfileImageRequestBuilder;
+import com.clerk.backend_api.models.operations.SetUserProfileImageResponse;
+import com.clerk.backend_api.models.operations.UnbanUserRequest;
+import com.clerk.backend_api.models.operations.UnbanUserRequestBuilder;
+import com.clerk.backend_api.models.operations.UnbanUserResponse;
+import com.clerk.backend_api.models.operations.UnlockUserRequest;
+import com.clerk.backend_api.models.operations.UnlockUserRequestBuilder;
+import com.clerk.backend_api.models.operations.UnlockUserResponse;
+import com.clerk.backend_api.models.operations.UpdateUserMetadataRequest;
+import com.clerk.backend_api.models.operations.UpdateUserMetadataRequestBody;
+import com.clerk.backend_api.models.operations.UpdateUserMetadataRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateUserMetadataResponse;
+import com.clerk.backend_api.models.operations.UpdateUserRequest;
+import com.clerk.backend_api.models.operations.UpdateUserRequestBody;
+import com.clerk.backend_api.models.operations.UpdateUserRequestBuilder;
+import com.clerk.backend_api.models.operations.UpdateUserResponse;
+import com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRequest;
+import com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRequestBuilder;
+import com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsResponse;
+import com.clerk.backend_api.models.operations.VerifyPasswordRequest;
+import com.clerk.backend_api.models.operations.VerifyPasswordRequestBody;
+import com.clerk.backend_api.models.operations.VerifyPasswordRequestBuilder;
+import com.clerk.backend_api.models.operations.VerifyPasswordResponse;
+import com.clerk.backend_api.models.operations.VerifyPasswordResponseBody;
+import com.clerk.backend_api.models.operations.VerifyTOTPRequest;
+import com.clerk.backend_api.models.operations.VerifyTOTPRequestBody;
+import com.clerk.backend_api.models.operations.VerifyTOTPRequestBuilder;
+import com.clerk.backend_api.models.operations.VerifyTOTPResponse;
+import com.clerk.backend_api.models.operations.VerifyTOTPResponseBody;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.SerializedBody;
+import com.clerk.backend_api.utils.Utils.JsonShape;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.ReadContext;
 import java.io.InputStream;
+import java.lang.Exception;
 import java.lang.Long;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Object;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.Optional;
-import org.apache.http.NameValuePair;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.Optional; 
 
 public class Users implements
             MethodCallGetUserList,
@@ -64,8 +130,8 @@ public class Users implements
      * The users are returned sorted by creation date, with the newest users appearing first.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetUserListRequestBuilder list() {
-        return new com.clerk.backend_api.models.operations.GetUserListRequestBuilder(this);
+    public GetUserListRequestBuilder list() {
+        return new GetUserListRequestBuilder(this);
     }
 
     /**
@@ -76,8 +142,8 @@ public com.clerk.backend_api.models.operations.GetUserListRequestBuilder list()
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetUserListResponse list(
-            com.clerk.backend_api.models.operations.GetUserListRequest request) throws Exception {
+    public GetUserListResponse list(
+            GetUserListRequest request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
@@ -89,7 +155,7 @@ public com.clerk.backend_api.models.operations.GetUserListResponse list(
                 this.sdkConfiguration.userAgent);
 
         _req.addQueryParams(Utils.getQueryParams(
-                com.clerk.backend_api.models.operations.GetUserListRequest.class,
+                GetUserListRequest.class,
                 request, 
                 null));
 
@@ -100,7 +166,10 @@ public com.clerk.backend_api.models.operations.GetUserListResponse list(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetUserList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetUserList", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -108,18 +177,28 @@ public com.clerk.backend_api.models.operations.GetUserListResponse list(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetUserList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetUserList",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetUserList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetUserList",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetUserList", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetUserList",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -127,42 +206,42 @@ public com.clerk.backend_api.models.operations.GetUserListResponse list(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetUserListResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetUserListResponse
+        GetUserListResponse.Builder _resBuilder = 
+            GetUserListResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetUserListResponse _res = _resBuilder.build();
+        GetUserListResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                java.util.List<com.clerk.backend_api.models.components.User> _out = Utils.mapper().readValue(
+                List<User> _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<java.util.List<com.clerk.backend_api.models.components.User>>() {});
-                _res.withUserList(java.util.Optional.ofNullable(_out));
+                    new TypeReference<List<User>>() {});
+                _res.withUserList(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -171,13 +250,13 @@ public com.clerk.backend_api.models.operations.GetUserListResponse list(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -193,8 +272,8 @@ public com.clerk.backend_api.models.operations.GetUserListResponse list(
      * A rate limit rule of 20 requests per 10 seconds is applied to this endpoint.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateUserRequestBuilder create() {
-        return new com.clerk.backend_api.models.operations.CreateUserRequestBuilder(this);
+    public CreateUserRequestBuilder create() {
+        return new CreateUserRequestBuilder(this);
     }
 
     /**
@@ -210,18 +289,23 @@ public com.clerk.backend_api.models.operations.CreateUserRequestBuilder create()
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateUserResponse create(
-            com.clerk.backend_api.models.operations.CreateUserRequestBody request) throws Exception {
+    public CreateUserResponse create(
+            CreateUserRequestBody request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
                 "/users");
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<com.clerk.backend_api.models.operations.CreateUserRequestBody>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<CreateUserRequestBody>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "request", "json", false);
+                _convertedRequest, 
+                "request",
+                "json",
+                false);
         if (_serializedRequestBody == null) {
             throw new Exception("Request body is required");
         }
@@ -237,7 +321,10 @@ public com.clerk.backend_api.models.operations.CreateUserResponse create(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateUser", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -245,18 +332,28 @@ public com.clerk.backend_api.models.operations.CreateUserResponse create(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateUser",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -264,42 +361,42 @@ public com.clerk.backend_api.models.operations.CreateUserResponse create(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateUserResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateUserResponse
+        CreateUserResponse.Builder _resBuilder = 
+            CreateUserResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateUserResponse _res = _resBuilder.build();
+        CreateUserResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.User _out = Utils.mapper().readValue(
+                User _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.User>() {});
-                _res.withUser(java.util.Optional.ofNullable(_out));
+                    new TypeReference<User>() {});
+                _res.withUser(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "403", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -308,13 +405,13 @@ public com.clerk.backend_api.models.operations.CreateUserResponse create(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -324,8 +421,8 @@ public com.clerk.backend_api.models.operations.CreateUserResponse create(
      * Returns a total count of all users that match the given filtering criteria.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetUsersCountRequestBuilder count() {
-        return new com.clerk.backend_api.models.operations.GetUsersCountRequestBuilder(this);
+    public GetUsersCountRequestBuilder count() {
+        return new GetUsersCountRequestBuilder(this);
     }
 
     /**
@@ -335,8 +432,8 @@ public com.clerk.backend_api.models.operations.GetUsersCountRequestBuilder count
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetUsersCountResponse count(
-            com.clerk.backend_api.models.operations.GetUsersCountRequest request) throws Exception {
+    public GetUsersCountResponse count(
+            GetUsersCountRequest request) throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
@@ -348,7 +445,7 @@ public com.clerk.backend_api.models.operations.GetUsersCountResponse count(
                 this.sdkConfiguration.userAgent);
 
         _req.addQueryParams(Utils.getQueryParams(
-                com.clerk.backend_api.models.operations.GetUsersCountRequest.class,
+                GetUsersCountRequest.class,
                 request, 
                 null));
 
@@ -359,7 +456,10 @@ public com.clerk.backend_api.models.operations.GetUsersCountResponse count(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetUsersCount", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetUsersCount", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -367,18 +467,28 @@ public com.clerk.backend_api.models.operations.GetUsersCountResponse count(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetUsersCount", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetUsersCount",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetUsersCount", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetUsersCount",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetUsersCount", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetUsersCount",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -386,42 +496,42 @@ public com.clerk.backend_api.models.operations.GetUsersCountResponse count(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetUsersCountResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetUsersCountResponse
+        GetUsersCountResponse.Builder _resBuilder = 
+            GetUsersCountResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetUsersCountResponse _res = _resBuilder.build();
+        GetUsersCountResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.TotalCount _out = Utils.mapper().readValue(
+                TotalCount _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.TotalCount>() {});
-                _res.withTotalCount(java.util.Optional.ofNullable(_out));
+                    new TypeReference<TotalCount>() {});
+                _res.withTotalCount(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -430,13 +540,13 @@ public com.clerk.backend_api.models.operations.GetUsersCountResponse count(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -446,8 +556,8 @@ public com.clerk.backend_api.models.operations.GetUsersCountResponse count(
      * Retrieve the details of a user
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetUserRequestBuilder get() {
-        return new com.clerk.backend_api.models.operations.GetUserRequestBuilder(this);
+    public GetUserRequestBuilder get() {
+        return new GetUserRequestBuilder(this);
     }
 
     /**
@@ -457,17 +567,17 @@ public com.clerk.backend_api.models.operations.GetUserRequestBuilder get() {
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetUserResponse get(
+    public GetUserResponse get(
             String userId) throws Exception {
-        com.clerk.backend_api.models.operations.GetUserRequest request =
-            com.clerk.backend_api.models.operations.GetUserRequest
+        GetUserRequest request =
+            GetUserRequest
                 .builder()
                 .userId(userId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.GetUserRequest.class,
+                GetUserRequest.class,
                 _baseUrl,
                 "/users/{user_id}",
                 request, null);
@@ -484,7 +594,10 @@ public com.clerk.backend_api.models.operations.GetUserResponse get(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetUser", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -492,18 +605,28 @@ public com.clerk.backend_api.models.operations.GetUserResponse get(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetUser",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -511,42 +634,42 @@ public com.clerk.backend_api.models.operations.GetUserResponse get(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetUserResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetUserResponse
+        GetUserResponse.Builder _resBuilder = 
+            GetUserResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetUserResponse _res = _resBuilder.build();
+        GetUserResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.User _out = Utils.mapper().readValue(
+                User _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.User>() {});
-                _res.withUser(java.util.Optional.ofNullable(_out));
+                    new TypeReference<User>() {});
+                _res.withUser(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -555,13 +678,13 @@ public com.clerk.backend_api.models.operations.GetUserResponse get(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -582,8 +705,8 @@ public com.clerk.backend_api.models.operations.GetUserResponse get(
      * You can also choose to sign the user out of all their active sessions on any device once the password is updated. Just set `sign_out_of_other_sessions` to `true`.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateUserRequestBuilder update() {
-        return new com.clerk.backend_api.models.operations.UpdateUserRequestBuilder(this);
+    public UpdateUserRequestBuilder update() {
+        return new UpdateUserRequestBuilder(this);
     }
 
     /**
@@ -605,11 +728,11 @@ public com.clerk.backend_api.models.operations.UpdateUserRequestBuilder update()
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateUserResponse update(
+    public UpdateUserResponse update(
             String userId,
-            com.clerk.backend_api.models.operations.UpdateUserRequestBody requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.UpdateUserRequest request =
-            com.clerk.backend_api.models.operations.UpdateUserRequest
+            UpdateUserRequestBody requestBody) throws Exception {
+        UpdateUserRequest request =
+            UpdateUserRequest
                 .builder()
                 .userId(userId)
                 .requestBody(requestBody)
@@ -617,16 +740,21 @@ public com.clerk.backend_api.models.operations.UpdateUserResponse update(
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UpdateUserRequest.class,
+                UpdateUserRequest.class,
                 _baseUrl,
                 "/users/{user_id}",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         if (_serializedRequestBody == null) {
             throw new Exception("Request body is required");
         }
@@ -642,7 +770,10 @@ public com.clerk.backend_api.models.operations.UpdateUserResponse update(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateUser", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -650,18 +781,28 @@ public com.clerk.backend_api.models.operations.UpdateUserResponse update(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateUser",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -669,42 +810,42 @@ public com.clerk.backend_api.models.operations.UpdateUserResponse update(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateUserResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateUserResponse
+        UpdateUserResponse.Builder _resBuilder = 
+            UpdateUserResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateUserResponse _res = _resBuilder.build();
+        UpdateUserResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.User _out = Utils.mapper().readValue(
+                User _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.User>() {});
-                _res.withUser(java.util.Optional.ofNullable(_out));
+                    new TypeReference<User>() {});
+                _res.withUser(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -713,13 +854,13 @@ public com.clerk.backend_api.models.operations.UpdateUserResponse update(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -729,8 +870,8 @@ public com.clerk.backend_api.models.operations.UpdateUserResponse update(
      * Delete the specified user
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeleteUserRequestBuilder delete() {
-        return new com.clerk.backend_api.models.operations.DeleteUserRequestBuilder(this);
+    public DeleteUserRequestBuilder delete() {
+        return new DeleteUserRequestBuilder(this);
     }
 
     /**
@@ -740,17 +881,17 @@ public com.clerk.backend_api.models.operations.DeleteUserRequestBuilder delete()
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeleteUserResponse delete(
+    public DeleteUserResponse delete(
             String userId) throws Exception {
-        com.clerk.backend_api.models.operations.DeleteUserRequest request =
-            com.clerk.backend_api.models.operations.DeleteUserRequest
+        DeleteUserRequest request =
+            DeleteUserRequest
                 .builder()
                 .userId(userId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DeleteUserRequest.class,
+                DeleteUserRequest.class,
                 _baseUrl,
                 "/users/{user_id}",
                 request, null);
@@ -767,7 +908,10 @@ public com.clerk.backend_api.models.operations.DeleteUserResponse delete(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeleteUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeleteUser", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -775,18 +919,28 @@ public com.clerk.backend_api.models.operations.DeleteUserResponse delete(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeleteUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeleteUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeleteUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeleteUser",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeleteUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeleteUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -794,42 +948,42 @@ public com.clerk.backend_api.models.operations.DeleteUserResponse delete(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeleteUserResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeleteUserResponse
+        DeleteUserResponse.Builder _resBuilder = 
+            DeleteUserResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeleteUserResponse _res = _resBuilder.build();
+        DeleteUserResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.DeletedObject _out = Utils.mapper().readValue(
+                DeletedObject _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.DeletedObject>() {});
-                _res.withDeletedObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<DeletedObject>() {});
+                _res.withDeletedObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -838,13 +992,13 @@ public com.clerk.backend_api.models.operations.DeleteUserResponse delete(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -854,8 +1008,8 @@ public com.clerk.backend_api.models.operations.DeleteUserResponse delete(
      * Marks the given user as banned, which means that all their sessions are revoked and they are not allowed to sign in again.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.BanUserRequestBuilder ban() {
-        return new com.clerk.backend_api.models.operations.BanUserRequestBuilder(this);
+    public BanUserRequestBuilder ban() {
+        return new BanUserRequestBuilder(this);
     }
 
     /**
@@ -865,17 +1019,17 @@ public com.clerk.backend_api.models.operations.BanUserRequestBuilder ban() {
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.BanUserResponse ban(
+    public BanUserResponse ban(
             String userId) throws Exception {
-        com.clerk.backend_api.models.operations.BanUserRequest request =
-            com.clerk.backend_api.models.operations.BanUserRequest
+        BanUserRequest request =
+            BanUserRequest
                 .builder()
                 .userId(userId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.BanUserRequest.class,
+                BanUserRequest.class,
                 _baseUrl,
                 "/users/{user_id}/ban",
                 request, null);
@@ -892,7 +1046,10 @@ public com.clerk.backend_api.models.operations.BanUserResponse ban(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("BanUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "BanUser", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -900,18 +1057,28 @@ public com.clerk.backend_api.models.operations.BanUserResponse ban(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("BanUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "BanUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("BanUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "BanUser",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("BanUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "BanUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -919,42 +1086,42 @@ public com.clerk.backend_api.models.operations.BanUserResponse ban(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.BanUserResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.BanUserResponse
+        BanUserResponse.Builder _resBuilder = 
+            BanUserResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.BanUserResponse _res = _resBuilder.build();
+        BanUserResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.User _out = Utils.mapper().readValue(
+                User _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.User>() {});
-                _res.withUser(java.util.Optional.ofNullable(_out));
+                    new TypeReference<User>() {});
+                _res.withUser(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "402")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -963,13 +1130,13 @@ public com.clerk.backend_api.models.operations.BanUserResponse ban(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -979,8 +1146,8 @@ public com.clerk.backend_api.models.operations.BanUserResponse ban(
      * Removes the ban mark from the given user.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UnbanUserRequestBuilder unban() {
-        return new com.clerk.backend_api.models.operations.UnbanUserRequestBuilder(this);
+    public UnbanUserRequestBuilder unban() {
+        return new UnbanUserRequestBuilder(this);
     }
 
     /**
@@ -990,17 +1157,17 @@ public com.clerk.backend_api.models.operations.UnbanUserRequestBuilder unban() {
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UnbanUserResponse unban(
+    public UnbanUserResponse unban(
             String userId) throws Exception {
-        com.clerk.backend_api.models.operations.UnbanUserRequest request =
-            com.clerk.backend_api.models.operations.UnbanUserRequest
+        UnbanUserRequest request =
+            UnbanUserRequest
                 .builder()
                 .userId(userId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UnbanUserRequest.class,
+                UnbanUserRequest.class,
                 _baseUrl,
                 "/users/{user_id}/unban",
                 request, null);
@@ -1017,7 +1184,10 @@ public com.clerk.backend_api.models.operations.UnbanUserResponse unban(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UnbanUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UnbanUser", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -1025,18 +1195,28 @@ public com.clerk.backend_api.models.operations.UnbanUserResponse unban(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "402", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UnbanUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UnbanUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UnbanUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UnbanUser",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UnbanUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UnbanUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -1044,42 +1224,42 @@ public com.clerk.backend_api.models.operations.UnbanUserResponse unban(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UnbanUserResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UnbanUserResponse
+        UnbanUserResponse.Builder _resBuilder = 
+            UnbanUserResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UnbanUserResponse _res = _resBuilder.build();
+        UnbanUserResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.User _out = Utils.mapper().readValue(
+                User _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.User>() {});
-                _res.withUser(java.util.Optional.ofNullable(_out));
+                    new TypeReference<User>() {});
+                _res.withUser(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "402")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -1088,13 +1268,13 @@ public com.clerk.backend_api.models.operations.UnbanUserResponse unban(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -1105,8 +1285,8 @@ public com.clerk.backend_api.models.operations.UnbanUserResponse unban(
      * Lock duration can be configured in the instance's restrictions settings.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.LockUserRequestBuilder lock() {
-        return new com.clerk.backend_api.models.operations.LockUserRequestBuilder(this);
+    public LockUserRequestBuilder lock() {
+        return new LockUserRequestBuilder(this);
     }
 
     /**
@@ -1117,17 +1297,17 @@ public com.clerk.backend_api.models.operations.LockUserRequestBuilder lock() {
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.LockUserResponse lock(
+    public LockUserResponse lock(
             String userId) throws Exception {
-        com.clerk.backend_api.models.operations.LockUserRequest request =
-            com.clerk.backend_api.models.operations.LockUserRequest
+        LockUserRequest request =
+            LockUserRequest
                 .builder()
                 .userId(userId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.LockUserRequest.class,
+                LockUserRequest.class,
                 _baseUrl,
                 "/users/{user_id}/lock",
                 request, null);
@@ -1144,7 +1324,10 @@ public com.clerk.backend_api.models.operations.LockUserResponse lock(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("LockUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "LockUser", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -1152,18 +1335,28 @@ public com.clerk.backend_api.models.operations.LockUserResponse lock(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("LockUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "LockUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("LockUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "LockUser",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("LockUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "LockUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -1171,42 +1364,42 @@ public com.clerk.backend_api.models.operations.LockUserResponse lock(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.LockUserResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.LockUserResponse
+        LockUserResponse.Builder _resBuilder = 
+            LockUserResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.LockUserResponse _res = _resBuilder.build();
+        LockUserResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.User _out = Utils.mapper().readValue(
+                User _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.User>() {});
-                _res.withUser(java.util.Optional.ofNullable(_out));
+                    new TypeReference<User>() {});
+                _res.withUser(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "403")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -1215,13 +1408,13 @@ public com.clerk.backend_api.models.operations.LockUserResponse lock(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -1231,8 +1424,8 @@ public com.clerk.backend_api.models.operations.LockUserResponse lock(
      * Removes the lock from the given user.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UnlockUserRequestBuilder unlock() {
-        return new com.clerk.backend_api.models.operations.UnlockUserRequestBuilder(this);
+    public UnlockUserRequestBuilder unlock() {
+        return new UnlockUserRequestBuilder(this);
     }
 
     /**
@@ -1242,17 +1435,17 @@ public com.clerk.backend_api.models.operations.UnlockUserRequestBuilder unlock()
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UnlockUserResponse unlock(
+    public UnlockUserResponse unlock(
             String userId) throws Exception {
-        com.clerk.backend_api.models.operations.UnlockUserRequest request =
-            com.clerk.backend_api.models.operations.UnlockUserRequest
+        UnlockUserRequest request =
+            UnlockUserRequest
                 .builder()
                 .userId(userId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UnlockUserRequest.class,
+                UnlockUserRequest.class,
                 _baseUrl,
                 "/users/{user_id}/unlock",
                 request, null);
@@ -1269,7 +1462,10 @@ public com.clerk.backend_api.models.operations.UnlockUserResponse unlock(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UnlockUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UnlockUser", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -1277,18 +1473,28 @@ public com.clerk.backend_api.models.operations.UnlockUserResponse unlock(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UnlockUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UnlockUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UnlockUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UnlockUser",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UnlockUser", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UnlockUser",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -1296,42 +1502,42 @@ public com.clerk.backend_api.models.operations.UnlockUserResponse unlock(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UnlockUserResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UnlockUserResponse
+        UnlockUserResponse.Builder _resBuilder = 
+            UnlockUserResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UnlockUserResponse _res = _resBuilder.build();
+        UnlockUserResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.User _out = Utils.mapper().readValue(
+                User _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.User>() {});
-                _res.withUser(java.util.Optional.ofNullable(_out));
+                    new TypeReference<User>() {});
+                _res.withUser(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "403")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -1340,13 +1546,13 @@ public com.clerk.backend_api.models.operations.UnlockUserResponse unlock(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -1356,8 +1562,8 @@ public com.clerk.backend_api.models.operations.UnlockUserResponse unlock(
      * Update a user's profile image
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.SetUserProfileImageRequestBuilder setProfileImage() {
-        return new com.clerk.backend_api.models.operations.SetUserProfileImageRequestBuilder(this);
+    public SetUserProfileImageRequestBuilder setProfileImage() {
+        return new SetUserProfileImageRequestBuilder(this);
     }
 
     /**
@@ -1368,11 +1574,11 @@ public com.clerk.backend_api.models.operations.SetUserProfileImageRequestBuilder
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.SetUserProfileImageResponse setProfileImage(
+    public SetUserProfileImageResponse setProfileImage(
             String userId,
-            com.clerk.backend_api.models.operations.SetUserProfileImageRequestBody requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.SetUserProfileImageRequest request =
-            com.clerk.backend_api.models.operations.SetUserProfileImageRequest
+            SetUserProfileImageRequestBody requestBody) throws Exception {
+        SetUserProfileImageRequest request =
+            SetUserProfileImageRequest
                 .builder()
                 .userId(userId)
                 .requestBody(requestBody)
@@ -1380,16 +1586,21 @@ public com.clerk.backend_api.models.operations.SetUserProfileImageResponse setPr
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.SetUserProfileImageRequest.class,
+                SetUserProfileImageRequest.class,
                 _baseUrl,
                 "/users/{user_id}/profile_image",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "multipart", false);
+                _convertedRequest, 
+                "requestBody",
+                "multipart",
+                false);
         if (_serializedRequestBody == null) {
             throw new Exception("Request body is required");
         }
@@ -1405,7 +1616,10 @@ public com.clerk.backend_api.models.operations.SetUserProfileImageResponse setPr
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("SetUserProfileImage", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "SetUserProfileImage", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -1413,18 +1627,28 @@ public com.clerk.backend_api.models.operations.SetUserProfileImageResponse setPr
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("SetUserProfileImage", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "SetUserProfileImage",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("SetUserProfileImage", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "SetUserProfileImage",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("SetUserProfileImage", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "SetUserProfileImage",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -1432,42 +1656,42 @@ public com.clerk.backend_api.models.operations.SetUserProfileImageResponse setPr
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.SetUserProfileImageResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.SetUserProfileImageResponse
+        SetUserProfileImageResponse.Builder _resBuilder = 
+            SetUserProfileImageResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.SetUserProfileImageResponse _res = _resBuilder.build();
+        SetUserProfileImageResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.User _out = Utils.mapper().readValue(
+                User _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.User>() {});
-                _res.withUser(java.util.Optional.ofNullable(_out));
+                    new TypeReference<User>() {});
+                _res.withUser(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -1476,13 +1700,13 @@ public com.clerk.backend_api.models.operations.SetUserProfileImageResponse setPr
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -1492,8 +1716,8 @@ public com.clerk.backend_api.models.operations.SetUserProfileImageResponse setPr
      * Delete a user's profile image
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeleteUserProfileImageRequestBuilder deleteProfileImage() {
-        return new com.clerk.backend_api.models.operations.DeleteUserProfileImageRequestBuilder(this);
+    public DeleteUserProfileImageRequestBuilder deleteProfileImage() {
+        return new DeleteUserProfileImageRequestBuilder(this);
     }
 
     /**
@@ -1503,17 +1727,17 @@ public com.clerk.backend_api.models.operations.DeleteUserProfileImageRequestBuil
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeleteUserProfileImageResponse deleteProfileImage(
+    public DeleteUserProfileImageResponse deleteProfileImage(
             String userId) throws Exception {
-        com.clerk.backend_api.models.operations.DeleteUserProfileImageRequest request =
-            com.clerk.backend_api.models.operations.DeleteUserProfileImageRequest
+        DeleteUserProfileImageRequest request =
+            DeleteUserProfileImageRequest
                 .builder()
                 .userId(userId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DeleteUserProfileImageRequest.class,
+                DeleteUserProfileImageRequest.class,
                 _baseUrl,
                 "/users/{user_id}/profile_image",
                 request, null);
@@ -1530,7 +1754,10 @@ public com.clerk.backend_api.models.operations.DeleteUserProfileImageResponse de
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeleteUserProfileImage", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeleteUserProfileImage", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -1538,18 +1765,28 @@ public com.clerk.backend_api.models.operations.DeleteUserProfileImageResponse de
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "404", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeleteUserProfileImage", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeleteUserProfileImage",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeleteUserProfileImage", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeleteUserProfileImage",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeleteUserProfileImage", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeleteUserProfileImage",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -1557,42 +1794,42 @@ public com.clerk.backend_api.models.operations.DeleteUserProfileImageResponse de
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeleteUserProfileImageResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeleteUserProfileImageResponse
+        DeleteUserProfileImageResponse.Builder _resBuilder = 
+            DeleteUserProfileImageResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeleteUserProfileImageResponse _res = _resBuilder.build();
+        DeleteUserProfileImageResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.User _out = Utils.mapper().readValue(
+                User _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.User>() {});
-                _res.withUser(java.util.Optional.ofNullable(_out));
+                    new TypeReference<User>() {});
+                _res.withUser(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "404")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -1601,13 +1838,13 @@ public com.clerk.backend_api.models.operations.DeleteUserProfileImageResponse de
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -1624,8 +1861,8 @@ public com.clerk.backend_api.models.operations.DeleteUserProfileImageResponse de
      * You can remove metadata keys at any level by setting their value to `null`.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UpdateUserMetadataRequestBuilder updateMetadata() {
-        return new com.clerk.backend_api.models.operations.UpdateUserMetadataRequestBuilder(this);
+    public UpdateUserMetadataRequestBuilder updateMetadata() {
+        return new UpdateUserMetadataRequestBuilder(this);
     }
 
     /**
@@ -1642,10 +1879,11 @@ public com.clerk.backend_api.models.operations.UpdateUserMetadataRequestBuilder
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateUserMetadataResponse updateMetadata(
+    public UpdateUserMetadataResponse updateMetadata(
             String userId) throws Exception {
         return updateMetadata(userId, Optional.empty());
     }
+    
     /**
      * Merge and update a user's metadata
      * Update a user's metadata attributes by merging existing values with the provided parameters.
@@ -1661,11 +1899,11 @@ public com.clerk.backend_api.models.operations.UpdateUserMetadataResponse update
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UpdateUserMetadataResponse updateMetadata(
+    public UpdateUserMetadataResponse updateMetadata(
             String userId,
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateUserMetadataRequestBody> requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.UpdateUserMetadataRequest request =
-            com.clerk.backend_api.models.operations.UpdateUserMetadataRequest
+            Optional<? extends UpdateUserMetadataRequestBody> requestBody) throws Exception {
+        UpdateUserMetadataRequest request =
+            UpdateUserMetadataRequest
                 .builder()
                 .userId(userId)
                 .requestBody(requestBody)
@@ -1673,16 +1911,21 @@ public com.clerk.backend_api.models.operations.UpdateUserMetadataResponse update
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UpdateUserMetadataRequest.class,
+                UpdateUserMetadataRequest.class,
                 _baseUrl,
                 "/users/{user_id}/metadata",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "PATCH");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -1695,7 +1938,10 @@ public com.clerk.backend_api.models.operations.UpdateUserMetadataResponse update
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UpdateUserMetadata", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UpdateUserMetadata", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -1703,18 +1949,28 @@ public com.clerk.backend_api.models.operations.UpdateUserMetadataResponse update
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UpdateUserMetadata", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UpdateUserMetadata",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UpdateUserMetadata", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UpdateUserMetadata",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UpdateUserMetadata", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UpdateUserMetadata",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -1722,42 +1978,42 @@ public com.clerk.backend_api.models.operations.UpdateUserMetadataResponse update
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.UpdateUserMetadataResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UpdateUserMetadataResponse
+        UpdateUserMetadataResponse.Builder _resBuilder = 
+            UpdateUserMetadataResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.UpdateUserMetadataResponse _res = _resBuilder.build();
+        UpdateUserMetadataResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.User _out = Utils.mapper().readValue(
+                User _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.User>() {});
-                _res.withUser(java.util.Optional.ofNullable(_out));
+                    new TypeReference<User>() {});
+                _res.withUser(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "401", "404", "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -1766,13 +2022,13 @@ public com.clerk.backend_api.models.operations.UpdateUserMetadataResponse update
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -1783,8 +2039,8 @@ public com.clerk.backend_api.models.operations.UpdateUserMetadataResponse update
      * For OAuth 2.0, if the access token has expired and we have a corresponding refresh token, the access token will be refreshed transparently the new one will be returned.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GetOAuthAccessTokenRequestBuilder getOAuthAccessToken() {
-        return new com.clerk.backend_api.models.operations.GetOAuthAccessTokenRequestBuilder(this);
+    public GetOAuthAccessTokenRequestBuilder getOAuthAccessToken() {
+        return new GetOAuthAccessTokenRequestBuilder(this);
     }
 
     /**
@@ -1796,11 +2052,11 @@ public com.clerk.backend_api.models.operations.GetOAuthAccessTokenRequestBuilder
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GetOAuthAccessTokenResponse getOAuthAccessToken(
+    public GetOAuthAccessTokenResponse getOAuthAccessToken(
             String userId,
             String provider) throws Exception {
-        com.clerk.backend_api.models.operations.GetOAuthAccessTokenRequest request =
-            com.clerk.backend_api.models.operations.GetOAuthAccessTokenRequest
+        GetOAuthAccessTokenRequest request =
+            GetOAuthAccessTokenRequest
                 .builder()
                 .userId(userId)
                 .provider(provider)
@@ -1808,7 +2064,7 @@ public com.clerk.backend_api.models.operations.GetOAuthAccessTokenResponse getOA
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.GetOAuthAccessTokenRequest.class,
+                GetOAuthAccessTokenRequest.class,
                 _baseUrl,
                 "/users/{user_id}/oauth_access_tokens/{provider}",
                 request, null);
@@ -1825,7 +2081,10 @@ public com.clerk.backend_api.models.operations.GetOAuthAccessTokenResponse getOA
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GetOAuthAccessToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GetOAuthAccessToken", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -1833,18 +2092,28 @@ public com.clerk.backend_api.models.operations.GetOAuthAccessTokenResponse getOA
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "422", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GetOAuthAccessToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GetOAuthAccessToken",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GetOAuthAccessToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GetOAuthAccessToken",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GetOAuthAccessToken", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GetOAuthAccessToken",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -1852,42 +2121,42 @@ public com.clerk.backend_api.models.operations.GetOAuthAccessTokenResponse getOA
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GetOAuthAccessTokenResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GetOAuthAccessTokenResponse
+        GetOAuthAccessTokenResponse.Builder _resBuilder = 
+            GetOAuthAccessTokenResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GetOAuthAccessTokenResponse _res = _resBuilder.build();
+        GetOAuthAccessTokenResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                java.util.List<com.clerk.backend_api.models.operations.ResponseBody> _out = Utils.mapper().readValue(
+                List<ResponseBody> _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<java.util.List<com.clerk.backend_api.models.operations.ResponseBody>>() {});
-                _res.withResponseBodies(java.util.Optional.ofNullable(_out));
+                    new TypeReference<List<ResponseBody>>() {});
+                _res.withResponseBodies(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "422")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -1896,13 +2165,13 @@ public com.clerk.backend_api.models.operations.GetOAuthAccessTokenResponse getOA
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -1912,8 +2181,8 @@ public com.clerk.backend_api.models.operations.GetOAuthAccessTokenResponse getOA
      * Retrieve a paginated list of the user's organization memberships
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRequestBuilder getOrganizationMemberships() {
-        return new com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRequestBuilder(this);
+    public UsersGetOrganizationMembershipsRequestBuilder getOrganizationMemberships() {
+        return new UsersGetOrganizationMembershipsRequestBuilder(this);
     }
 
     /**
@@ -1923,10 +2192,11 @@ public com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRe
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsResponse getOrganizationMemberships(
+    public UsersGetOrganizationMembershipsResponse getOrganizationMemberships(
             String userId) throws Exception {
         return getOrganizationMemberships(userId, Optional.empty(), Optional.empty());
     }
+    
     /**
      * Retrieve all memberships for a user
      * Retrieve a paginated list of the user's organization memberships
@@ -1939,12 +2209,12 @@ public com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRe
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsResponse getOrganizationMemberships(
+    public UsersGetOrganizationMembershipsResponse getOrganizationMemberships(
             String userId,
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) throws Exception {
-        com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRequest request =
-            com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRequest
+            Optional<Long> limit,
+            Optional<Long> offset) throws Exception {
+        UsersGetOrganizationMembershipsRequest request =
+            UsersGetOrganizationMembershipsRequest
                 .builder()
                 .userId(userId)
                 .limit(limit)
@@ -1953,7 +2223,7 @@ public com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRe
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRequest.class,
+                UsersGetOrganizationMembershipsRequest.class,
                 _baseUrl,
                 "/users/{user_id}/organization_memberships",
                 request, null);
@@ -1964,7 +2234,7 @@ public com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRe
                 this.sdkConfiguration.userAgent);
 
         _req.addQueryParams(Utils.getQueryParams(
-                com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRequest.class,
+                UsersGetOrganizationMembershipsRequest.class,
                 request, 
                 null));
 
@@ -1975,7 +2245,10 @@ public com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRe
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("UsersGetOrganizationMemberships", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "UsersGetOrganizationMemberships", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -1983,18 +2256,28 @@ public com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRe
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "403", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("UsersGetOrganizationMemberships", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "UsersGetOrganizationMemberships",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("UsersGetOrganizationMemberships", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "UsersGetOrganizationMemberships",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("UsersGetOrganizationMemberships", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "UsersGetOrganizationMemberships",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -2002,11 +2285,11 @@ public com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRe
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        byte[] _fullResponse = Utils.toByteArrayAndClose(_httpRes.body());
+        byte[] _fullResponse = Utils.extractByteArrayFromBody(_httpRes);
         
         @SuppressWarnings("deprecation")
-        com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsResponse
+        UsersGetOrganizationMembershipsResponse.Builder _resBuilder = 
+            UsersGetOrganizationMembershipsResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
@@ -2029,22 +2312,22 @@ public com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRe
                     if (_firstResult.size() < _resolvedLimit) {
                         return Optional.empty();
                     };
-                    long _newOffset = _requestOffset + _firstResult.size();
-                    com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRequestBuilder _ret = getOrganizationMemberships();
+                    long _newOffset = _requestOffset + _firstResult.size(); 
+                    UsersGetOrganizationMembershipsRequestBuilder _ret = getOrganizationMemberships();
                     _ret.userId(userId);
                     _ret.limit(_resolvedLimit);
                     _ret.offset(_newOffset);
                     return Optional.of(_ret.call());
                 });
 
-        com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsResponse _res = _resBuilder.build();
+        UsersGetOrganizationMembershipsResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.OrganizationMemberships _out = Utils.mapper().readValue(
+                OrganizationMemberships _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
-                    new TypeReference<com.clerk.backend_api.models.components.OrganizationMemberships>() {});
-                _res.withOrganizationMemberships(java.util.Optional.ofNullable(_out));
+                    new TypeReference<OrganizationMemberships>() {});
+                _res.withOrganizationMemberships(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
@@ -2056,9 +2339,9 @@ public com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRe
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "403")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     new String(_fullResponse, StandardCharsets.UTF_8),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
@@ -2091,8 +2374,8 @@ public com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsRe
      * Useful for custom auth flows and re-verification.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.VerifyPasswordRequestBuilder verifyPassword() {
-        return new com.clerk.backend_api.models.operations.VerifyPasswordRequestBuilder(this);
+    public VerifyPasswordRequestBuilder verifyPassword() {
+        return new VerifyPasswordRequestBuilder(this);
     }
 
     /**
@@ -2103,10 +2386,11 @@ public com.clerk.backend_api.models.operations.VerifyPasswordRequestBuilder veri
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.VerifyPasswordResponse verifyPassword(
+    public VerifyPasswordResponse verifyPassword(
             String userId) throws Exception {
         return verifyPassword(userId, Optional.empty());
     }
+    
     /**
      * Verify the password of a user
      * Check that the user's password matches the supplied input.
@@ -2116,11 +2400,11 @@ public com.clerk.backend_api.models.operations.VerifyPasswordResponse verifyPass
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.VerifyPasswordResponse verifyPassword(
+    public VerifyPasswordResponse verifyPassword(
             String userId,
-            Optional<? extends com.clerk.backend_api.models.operations.VerifyPasswordRequestBody> requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.VerifyPasswordRequest request =
-            com.clerk.backend_api.models.operations.VerifyPasswordRequest
+            Optional<? extends VerifyPasswordRequestBody> requestBody) throws Exception {
+        VerifyPasswordRequest request =
+            VerifyPasswordRequest
                 .builder()
                 .userId(userId)
                 .requestBody(requestBody)
@@ -2128,16 +2412,21 @@ public com.clerk.backend_api.models.operations.VerifyPasswordResponse verifyPass
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.VerifyPasswordRequest.class,
+                VerifyPasswordRequest.class,
                 _baseUrl,
                 "/users/{user_id}/verify_password",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -2150,7 +2439,10 @@ public com.clerk.backend_api.models.operations.VerifyPasswordResponse verifyPass
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("VerifyPassword", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "VerifyPassword", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -2158,18 +2450,28 @@ public com.clerk.backend_api.models.operations.VerifyPasswordResponse verifyPass
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "422", "4XX", "500", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("VerifyPassword", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "VerifyPassword",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("VerifyPassword", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "VerifyPassword",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("VerifyPassword", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "VerifyPassword",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -2177,28 +2479,28 @@ public com.clerk.backend_api.models.operations.VerifyPasswordResponse verifyPass
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.VerifyPasswordResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.VerifyPasswordResponse
+        VerifyPasswordResponse.Builder _resBuilder = 
+            VerifyPasswordResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.VerifyPasswordResponse _res = _resBuilder.build();
+        VerifyPasswordResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.operations.VerifyPasswordResponseBody _out = Utils.mapper().readValue(
+                VerifyPasswordResponseBody _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.operations.VerifyPasswordResponseBody>() {});
-                _res.withObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<VerifyPasswordResponseBody>() {});
+                _res.withObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "422", "4XX", "5XX")) {
@@ -2207,27 +2509,27 @@ public com.clerk.backend_api.models.operations.VerifyPasswordResponse verifyPass
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "500")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -2240,8 +2542,8 @@ public com.clerk.backend_api.models.operations.VerifyPasswordResponse verifyPass
      * Useful for custom auth flows and re-verification.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.VerifyTOTPRequestBuilder verifyTOTP() {
-        return new com.clerk.backend_api.models.operations.VerifyTOTPRequestBuilder(this);
+    public VerifyTOTPRequestBuilder verifyTOTP() {
+        return new VerifyTOTPRequestBuilder(this);
     }
 
     /**
@@ -2254,10 +2556,11 @@ public com.clerk.backend_api.models.operations.VerifyTOTPRequestBuilder verifyTO
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.VerifyTOTPResponse verifyTOTP(
+    public VerifyTOTPResponse verifyTOTP(
             String userId) throws Exception {
         return verifyTOTP(userId, Optional.empty());
     }
+    
     /**
      * Verify a TOTP or backup code for a user
      * Verify that the provided TOTP or backup code is valid for the user.
@@ -2269,11 +2572,11 @@ public com.clerk.backend_api.models.operations.VerifyTOTPResponse verifyTOTP(
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.VerifyTOTPResponse verifyTOTP(
+    public VerifyTOTPResponse verifyTOTP(
             String userId,
-            Optional<? extends com.clerk.backend_api.models.operations.VerifyTOTPRequestBody> requestBody) throws Exception {
-        com.clerk.backend_api.models.operations.VerifyTOTPRequest request =
-            com.clerk.backend_api.models.operations.VerifyTOTPRequest
+            Optional<? extends VerifyTOTPRequestBody> requestBody) throws Exception {
+        VerifyTOTPRequest request =
+            VerifyTOTPRequest
                 .builder()
                 .userId(userId)
                 .requestBody(requestBody)
@@ -2281,16 +2584,21 @@ public com.clerk.backend_api.models.operations.VerifyTOTPResponse verifyTOTP(
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.VerifyTOTPRequest.class,
+                VerifyTOTPRequest.class,
                 _baseUrl,
                 "/users/{user_id}/verify_totp",
                 request, null);
         
         HTTPRequest _req = new HTTPRequest(_url, "POST");
-        Object _convertedRequest = Utils.convertToShape(request, Utils.JsonShape.DEFAULT,
-            new TypeReference<java.lang.Object>() {});
+        Object _convertedRequest = Utils.convertToShape(
+                request, 
+                JsonShape.DEFAULT,
+                new TypeReference<Object>() {});
         SerializedBody _serializedRequestBody = Utils.serializeRequestBody(
-                _convertedRequest, "requestBody", "json", false);
+                _convertedRequest, 
+                "requestBody",
+                "json",
+                false);
         _req.setBody(Optional.ofNullable(_serializedRequestBody));
         _req.addHeader("Accept", "application/json")
             .addHeader("user-agent", 
@@ -2303,7 +2611,10 @@ public com.clerk.backend_api.models.operations.VerifyTOTPResponse verifyTOTP(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("VerifyTOTP", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "VerifyTOTP", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -2311,18 +2622,28 @@ public com.clerk.backend_api.models.operations.VerifyTOTPResponse verifyTOTP(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "422", "4XX", "500", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("VerifyTOTP", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "VerifyTOTP",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("VerifyTOTP", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "VerifyTOTP",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("VerifyTOTP", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "VerifyTOTP",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -2330,28 +2651,28 @@ public com.clerk.backend_api.models.operations.VerifyTOTPResponse verifyTOTP(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.VerifyTOTPResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.VerifyTOTPResponse
+        VerifyTOTPResponse.Builder _resBuilder = 
+            VerifyTOTPResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.VerifyTOTPResponse _res = _resBuilder.build();
+        VerifyTOTPResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.operations.VerifyTOTPResponseBody _out = Utils.mapper().readValue(
+                VerifyTOTPResponseBody _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.operations.VerifyTOTPResponseBody>() {});
-                _res.withObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<VerifyTOTPResponseBody>() {});
+                _res.withObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "404", "422", "4XX", "5XX")) {
@@ -2360,27 +2681,27 @@ public com.clerk.backend_api.models.operations.VerifyTOTPResponse verifyTOTP(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "500")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -2390,8 +2711,8 @@ public com.clerk.backend_api.models.operations.VerifyTOTPResponse verifyTOTP(
      * Disable all of a user's MFA methods (e.g. OTP sent via SMS, TOTP on their authenticator app) at once.
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DisableMFARequestBuilder disableMFA() {
-        return new com.clerk.backend_api.models.operations.DisableMFARequestBuilder(this);
+    public DisableMFARequestBuilder disableMFA() {
+        return new DisableMFARequestBuilder(this);
     }
 
     /**
@@ -2401,17 +2722,17 @@ public com.clerk.backend_api.models.operations.DisableMFARequestBuilder disableM
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DisableMFAResponse disableMFA(
+    public DisableMFAResponse disableMFA(
             String userId) throws Exception {
-        com.clerk.backend_api.models.operations.DisableMFARequest request =
-            com.clerk.backend_api.models.operations.DisableMFARequest
+        DisableMFARequest request =
+            DisableMFARequest
                 .builder()
                 .userId(userId)
                 .build();
         
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
-                com.clerk.backend_api.models.operations.DisableMFARequest.class,
+                DisableMFARequest.class,
                 _baseUrl,
                 "/users/{user_id}/mfa",
                 request, null);
@@ -2428,7 +2749,10 @@ public com.clerk.backend_api.models.operations.DisableMFAResponse disableMFA(
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DisableMFA", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DisableMFA", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -2436,18 +2760,28 @@ public com.clerk.backend_api.models.operations.DisableMFAResponse disableMFA(
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "404", "4XX", "500", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DisableMFA", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DisableMFA",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DisableMFA", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DisableMFA",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DisableMFA", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DisableMFA",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -2455,42 +2789,42 @@ public com.clerk.backend_api.models.operations.DisableMFAResponse disableMFA(
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DisableMFAResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DisableMFAResponse
+        DisableMFAResponse.Builder _resBuilder = 
+            DisableMFAResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DisableMFAResponse _res = _resBuilder.build();
+        DisableMFAResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.operations.DisableMFAResponseBody _out = Utils.mapper().readValue(
+                DisableMFAResponseBody _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.operations.DisableMFAResponseBody>() {});
-                _res.withObject(java.util.Optional.ofNullable(_out));
+                    new TypeReference<DisableMFAResponseBody>() {});
+                _res.withObject(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "404", "500")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -2499,13 +2833,13 @@ public com.clerk.backend_api.models.operations.DisableMFAResponse disableMFA(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/Webhooks.java b/src/main/java/com/clerk/backend_api/Webhooks.java
index d16360c..78969af 100644
--- a/src/main/java/com/clerk/backend_api/Webhooks.java
+++ b/src/main/java/com/clerk/backend_api/Webhooks.java
@@ -4,26 +4,30 @@
 
 package com.clerk.backend_api;
 
+import com.clerk.backend_api.models.components.SvixURL;
+import com.clerk.backend_api.models.errors.ClerkErrors;
 import com.clerk.backend_api.models.errors.SDKError;
+import com.clerk.backend_api.models.operations.CreateSvixAppRequestBuilder;
+import com.clerk.backend_api.models.operations.CreateSvixAppResponse;
+import com.clerk.backend_api.models.operations.DeleteSvixAppRequestBuilder;
+import com.clerk.backend_api.models.operations.DeleteSvixAppResponse;
+import com.clerk.backend_api.models.operations.GenerateSvixAuthURLRequestBuilder;
+import com.clerk.backend_api.models.operations.GenerateSvixAuthURLResponse;
 import com.clerk.backend_api.models.operations.SDKMethodInterfaces.*;
 import com.clerk.backend_api.utils.HTTPClient;
 import com.clerk.backend_api.utils.HTTPRequest;
 import com.clerk.backend_api.utils.Hook.AfterErrorContextImpl;
 import com.clerk.backend_api.utils.Hook.AfterSuccessContextImpl;
 import com.clerk.backend_api.utils.Hook.BeforeRequestContextImpl;
-import com.clerk.backend_api.utils.JSON;
-import com.clerk.backend_api.utils.Retries.NonRetryableException;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.String;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.List;
+import java.util.Optional; 
 
 public class Webhooks implements
             MethodCallCreateSvixApp,
@@ -42,8 +46,8 @@ public class Webhooks implements
      * Create a Svix app and associate it with the current instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.CreateSvixAppRequestBuilder createSvixApp() {
-        return new com.clerk.backend_api.models.operations.CreateSvixAppRequestBuilder(this);
+    public CreateSvixAppRequestBuilder createSvixApp() {
+        return new CreateSvixAppRequestBuilder(this);
     }
 
     /**
@@ -52,7 +56,7 @@ public com.clerk.backend_api.models.operations.CreateSvixAppRequestBuilder creat
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.CreateSvixAppResponse createSvixAppDirect() throws Exception {
+    public CreateSvixAppResponse createSvixAppDirect() throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
@@ -70,7 +74,10 @@ public com.clerk.backend_api.models.operations.CreateSvixAppResponse createSvixA
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("CreateSvixApp", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "CreateSvixApp", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -78,18 +85,28 @@ public com.clerk.backend_api.models.operations.CreateSvixAppResponse createSvixA
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("CreateSvixApp", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "CreateSvixApp",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("CreateSvixApp", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "CreateSvixApp",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("CreateSvixApp", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "CreateSvixApp",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -97,42 +114,42 @@ public com.clerk.backend_api.models.operations.CreateSvixAppResponse createSvixA
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.CreateSvixAppResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.CreateSvixAppResponse
+        CreateSvixAppResponse.Builder _resBuilder = 
+            CreateSvixAppResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.CreateSvixAppResponse _res = _resBuilder.build();
+        CreateSvixAppResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.SvixURL _out = Utils.mapper().readValue(
+                SvixURL _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.SvixURL>() {});
-                _res.withSvixURL(java.util.Optional.ofNullable(_out));
+                    new TypeReference<SvixURL>() {});
+                _res.withSvixURL(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -141,13 +158,13 @@ public com.clerk.backend_api.models.operations.CreateSvixAppResponse createSvixA
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -157,8 +174,8 @@ public com.clerk.backend_api.models.operations.CreateSvixAppResponse createSvixA
      * Delete a Svix app and disassociate it from the current instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.DeleteSvixAppRequestBuilder deleteSvixApp() {
-        return new com.clerk.backend_api.models.operations.DeleteSvixAppRequestBuilder(this);
+    public DeleteSvixAppRequestBuilder deleteSvixApp() {
+        return new DeleteSvixAppRequestBuilder(this);
     }
 
     /**
@@ -167,7 +184,7 @@ public com.clerk.backend_api.models.operations.DeleteSvixAppRequestBuilder delet
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.DeleteSvixAppResponse deleteSvixAppDirect() throws Exception {
+    public DeleteSvixAppResponse deleteSvixAppDirect() throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
@@ -185,7 +202,10 @@ public com.clerk.backend_api.models.operations.DeleteSvixAppResponse deleteSvixA
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("DeleteSvixApp", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "DeleteSvixApp", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -193,18 +213,28 @@ public com.clerk.backend_api.models.operations.DeleteSvixAppResponse deleteSvixA
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("DeleteSvixApp", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "DeleteSvixApp",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("DeleteSvixApp", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "DeleteSvixApp",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("DeleteSvixApp", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "DeleteSvixApp",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -212,14 +242,14 @@ public com.clerk.backend_api.models.operations.DeleteSvixAppResponse deleteSvixA
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.DeleteSvixAppResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.DeleteSvixAppResponse
+        DeleteSvixAppResponse.Builder _resBuilder = 
+            DeleteSvixAppResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.DeleteSvixAppResponse _res = _resBuilder.build();
+        DeleteSvixAppResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "204")) {
             // no content 
@@ -227,16 +257,16 @@ public com.clerk.backend_api.models.operations.DeleteSvixAppResponse deleteSvixA
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -245,13 +275,13 @@ public com.clerk.backend_api.models.operations.DeleteSvixAppResponse deleteSvixA
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 
@@ -261,8 +291,8 @@ public com.clerk.backend_api.models.operations.DeleteSvixAppResponse deleteSvixA
      * Generate a new url for accessing the Svix's management dashboard for that particular instance
      * @return The call builder
      */
-    public com.clerk.backend_api.models.operations.GenerateSvixAuthURLRequestBuilder generateSvixAuthURL() {
-        return new com.clerk.backend_api.models.operations.GenerateSvixAuthURLRequestBuilder(this);
+    public GenerateSvixAuthURLRequestBuilder generateSvixAuthURL() {
+        return new GenerateSvixAuthURLRequestBuilder(this);
     }
 
     /**
@@ -271,7 +301,7 @@ public com.clerk.backend_api.models.operations.GenerateSvixAuthURLRequestBuilder
      * @return The response from the API call
      * @throws Exception if the API call fails
      */
-    public com.clerk.backend_api.models.operations.GenerateSvixAuthURLResponse generateSvixAuthURLDirect() throws Exception {
+    public GenerateSvixAuthURLResponse generateSvixAuthURLDirect() throws Exception {
         String _baseUrl = this.sdkConfiguration.serverUrl;
         String _url = Utils.generateURL(
                 _baseUrl,
@@ -289,7 +319,10 @@ public com.clerk.backend_api.models.operations.GenerateSvixAuthURLResponse gener
         HttpRequest _r = 
             sdkConfiguration.hooks()
                .beforeRequest(
-                  new BeforeRequestContextImpl("GenerateSvixAuthURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                  new BeforeRequestContextImpl(
+                      "GenerateSvixAuthURL", 
+                      Optional.of(List.of()), 
+                      sdkConfiguration.securitySource()),
                   _req.build());
         HttpResponse<InputStream> _httpRes;
         try {
@@ -297,18 +330,28 @@ public com.clerk.backend_api.models.operations.GenerateSvixAuthURLResponse gener
             if (Utils.statusCodeMatches(_httpRes.statusCode(), "400", "4XX", "5XX")) {
                 _httpRes = sdkConfiguration.hooks()
                     .afterError(
-                        new AfterErrorContextImpl("GenerateSvixAuthURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterErrorContextImpl(
+                            "GenerateSvixAuthURL",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()),
                         Optional.of(_httpRes),
                         Optional.empty());
             } else {
                 _httpRes = sdkConfiguration.hooks()
                     .afterSuccess(
-                        new AfterSuccessContextImpl("GenerateSvixAuthURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()),
+                        new AfterSuccessContextImpl(
+                            "GenerateSvixAuthURL",
+                            Optional.of(List.of()), 
+                            sdkConfiguration.securitySource()),
                          _httpRes);
             }
         } catch (Exception _e) {
             _httpRes = sdkConfiguration.hooks()
-                    .afterError(new AfterErrorContextImpl("GenerateSvixAuthURL", Optional.of(java.util.List.of()), sdkConfiguration.securitySource()), 
+                    .afterError(
+                        new AfterErrorContextImpl(
+                            "GenerateSvixAuthURL",
+                            Optional.of(List.of()),
+                            sdkConfiguration.securitySource()), 
                         Optional.empty(),
                         Optional.of(_e));
         }
@@ -316,42 +359,42 @@ public com.clerk.backend_api.models.operations.GenerateSvixAuthURLResponse gener
             .headers()
             .firstValue("Content-Type")
             .orElse("application/octet-stream");
-        com.clerk.backend_api.models.operations.GenerateSvixAuthURLResponse.Builder _resBuilder = 
-            com.clerk.backend_api.models.operations.GenerateSvixAuthURLResponse
+        GenerateSvixAuthURLResponse.Builder _resBuilder = 
+            GenerateSvixAuthURLResponse
                 .builder()
                 .contentType(_contentType)
                 .statusCode(_httpRes.statusCode())
                 .rawResponse(_httpRes);
 
-        com.clerk.backend_api.models.operations.GenerateSvixAuthURLResponse _res = _resBuilder.build();
+        GenerateSvixAuthURLResponse _res = _resBuilder.build();
         
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "200")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.components.SvixURL _out = Utils.mapper().readValue(
+                SvixURL _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.components.SvixURL>() {});
-                _res.withSvixURL(java.util.Optional.ofNullable(_out));
+                    new TypeReference<SvixURL>() {});
+                _res.withSvixURL(Optional.ofNullable(_out));
                 return _res;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "400")) {
             if (Utils.contentTypeMatches(_contentType, "application/json")) {
-                com.clerk.backend_api.models.errors.ClerkErrors _out = Utils.mapper().readValue(
+                ClerkErrors _out = Utils.mapper().readValue(
                     Utils.toUtf8AndClose(_httpRes.body()),
-                    new TypeReference<com.clerk.backend_api.models.errors.ClerkErrors>() {});
+                    new TypeReference<ClerkErrors>() {});
                 throw _out;
             } else {
                 throw new SDKError(
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "Unexpected content-type received: " + _contentType, 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
             }
         }
         if (Utils.statusCodeMatches(_httpRes.statusCode(), "4XX", "5XX")) {
@@ -360,13 +403,13 @@ public com.clerk.backend_api.models.operations.GenerateSvixAuthURLResponse gener
                     _httpRes, 
                     _httpRes.statusCode(), 
                     "API error occurred", 
-                    Utils.toByteArrayAndClose(_httpRes.body()));
+                    Utils.extractByteArrayFromBody(_httpRes));
         }
         throw new SDKError(
             _httpRes, 
             _httpRes.statusCode(), 
             "Unexpected status code received: " + _httpRes.statusCode(), 
-            Utils.toByteArrayAndClose(_httpRes.body()));
+            Utils.extractByteArrayFromBody(_httpRes));
     }
 
 }
diff --git a/src/main/java/com/clerk/backend_api/models/components/Actor.java b/src/main/java/com/clerk/backend_api/models/components/Actor.java
index ea079a3..287c122 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Actor.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Actor.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class Actor {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/ActorToken.java b/src/main/java/com/clerk/backend_api/models/components/ActorToken.java
index 9b60b3f..d1eeaa2 100644
--- a/src/main/java/com/clerk/backend_api/models/components/ActorToken.java
+++ b/src/main/java/com/clerk/backend_api/models/components/ActorToken.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class ActorToken {
 
     @JsonProperty("object")
@@ -37,11 +37,11 @@ public class ActorToken {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("token")
-    private JsonNullable<? extends String> token;
+    private JsonNullable<String> token;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("url")
-    private JsonNullable<? extends String> url;
+    private JsonNullable<String> url;
 
     /**
      * Unix timestamp of creation.
@@ -64,8 +64,8 @@ public ActorToken(
             @JsonProperty("status") ActorTokenStatus status,
             @JsonProperty("user_id") String userId,
             @JsonProperty("actor") ActorTokenActor actor,
-            @JsonProperty("token") JsonNullable<? extends String> token,
-            @JsonProperty("url") JsonNullable<? extends String> url,
+            @JsonProperty("token") JsonNullable<String> token,
+            @JsonProperty("url") JsonNullable<String> url,
             @JsonProperty("created_at") long createdAt,
             @JsonProperty("updated_at") long updatedAt) {
         Utils.checkNotNull(object, "object");
@@ -124,16 +124,14 @@ public ActorTokenActor actor() {
         return actor;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> token() {
-        return (JsonNullable<String>) token;
+        return token;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> url() {
-        return (JsonNullable<String>) url;
+        return url;
     }
 
     /**
@@ -194,7 +192,7 @@ public ActorToken withToken(String token) {
         return this;
     }
 
-    public ActorToken withToken(JsonNullable<? extends String> token) {
+    public ActorToken withToken(JsonNullable<String> token) {
         Utils.checkNotNull(token, "token");
         this.token = token;
         return this;
@@ -206,7 +204,7 @@ public ActorToken withUrl(String url) {
         return this;
     }
 
-    public ActorToken withUrl(JsonNullable<? extends String> url) {
+    public ActorToken withUrl(JsonNullable<String> url) {
         Utils.checkNotNull(url, "url");
         this.url = url;
         return this;
@@ -242,20 +240,20 @@ public boolean equals(java.lang.Object o) {
         }
         ActorToken other = (ActorToken) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.actor, other.actor) &&
-            java.util.Objects.deepEquals(this.token, other.token) &&
-            java.util.Objects.deepEquals(this.url, other.url) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.actor, other.actor) &&
+            Objects.deepEquals(this.token, other.token) &&
+            Objects.deepEquals(this.url, other.url) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             status,
@@ -293,9 +291,9 @@ public final static class Builder {
  
         private ActorTokenActor actor;
  
-        private JsonNullable<? extends String> token = JsonNullable.undefined();
+        private JsonNullable<String> token = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> url = JsonNullable.undefined();
+        private JsonNullable<String> url = JsonNullable.undefined();
  
         private Long createdAt;
  
@@ -341,7 +339,7 @@ public Builder token(String token) {
             return this;
         }
 
-        public Builder token(JsonNullable<? extends String> token) {
+        public Builder token(JsonNullable<String> token) {
             Utils.checkNotNull(token, "token");
             this.token = token;
             return this;
@@ -353,7 +351,7 @@ public Builder url(String url) {
             return this;
         }
 
-        public Builder url(JsonNullable<? extends String> url) {
+        public Builder url(JsonNullable<String> url) {
             Utils.checkNotNull(url, "url");
             this.url = url;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/ActorTokenActor.java b/src/main/java/com/clerk/backend_api/models/components/ActorTokenActor.java
index 57fab79..b35a349 100644
--- a/src/main/java/com/clerk/backend_api/models/components/ActorTokenActor.java
+++ b/src/main/java/com/clerk/backend_api/models/components/ActorTokenActor.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class ActorTokenActor {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/ActorTokenObject.java b/src/main/java/com/clerk/backend_api/models/components/ActorTokenObject.java
index d87d3e4..a1d54fa 100644
--- a/src/main/java/com/clerk/backend_api/models/components/ActorTokenObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/ActorTokenObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum ActorTokenObject {
     ACTOR_TOKEN("actor_token");
diff --git a/src/main/java/com/clerk/backend_api/models/components/ActorTokenStatus.java b/src/main/java/com/clerk/backend_api/models/components/ActorTokenStatus.java
index 23441ee..d4ae5c7 100644
--- a/src/main/java/com/clerk/backend_api/models/components/ActorTokenStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/ActorTokenStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum ActorTokenStatus {
     PENDING("pending"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/Admin.java b/src/main/java/com/clerk/backend_api/models/components/Admin.java
index 275bea3..d690bc1 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Admin.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Admin.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class Admin {
 
     @JsonProperty("status")
@@ -28,18 +28,18 @@ public class Admin {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("attempts")
-    private JsonNullable<? extends Long> attempts;
+    private JsonNullable<Long> attempts;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("expire_at")
-    private JsonNullable<? extends Long> expireAt;
+    private JsonNullable<Long> expireAt;
 
     @JsonCreator
     public Admin(
             @JsonProperty("status") AdminVerificationStatus status,
             @JsonProperty("strategy") VerificationStrategy strategy,
-            @JsonProperty("attempts") JsonNullable<? extends Long> attempts,
-            @JsonProperty("expire_at") JsonNullable<? extends Long> expireAt) {
+            @JsonProperty("attempts") JsonNullable<Long> attempts,
+            @JsonProperty("expire_at") JsonNullable<Long> expireAt) {
         Utils.checkNotNull(status, "status");
         Utils.checkNotNull(strategy, "strategy");
         Utils.checkNotNull(attempts, "attempts");
@@ -66,16 +66,14 @@ public VerificationStrategy strategy() {
         return strategy;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> attempts() {
-        return (JsonNullable<Long>) attempts;
+        return attempts;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> expireAt() {
-        return (JsonNullable<Long>) expireAt;
+        return expireAt;
     }
 
     public final static Builder builder() {
@@ -100,7 +98,7 @@ public Admin withAttempts(long attempts) {
         return this;
     }
 
-    public Admin withAttempts(JsonNullable<? extends Long> attempts) {
+    public Admin withAttempts(JsonNullable<Long> attempts) {
         Utils.checkNotNull(attempts, "attempts");
         this.attempts = attempts;
         return this;
@@ -112,7 +110,7 @@ public Admin withExpireAt(long expireAt) {
         return this;
     }
 
-    public Admin withExpireAt(JsonNullable<? extends Long> expireAt) {
+    public Admin withExpireAt(JsonNullable<Long> expireAt) {
         Utils.checkNotNull(expireAt, "expireAt");
         this.expireAt = expireAt;
         return this;
@@ -128,15 +126,15 @@ public boolean equals(java.lang.Object o) {
         }
         Admin other = (Admin) o;
         return 
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.strategy, other.strategy) &&
-            java.util.Objects.deepEquals(this.attempts, other.attempts) &&
-            java.util.Objects.deepEquals(this.expireAt, other.expireAt);
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.strategy, other.strategy) &&
+            Objects.deepEquals(this.attempts, other.attempts) &&
+            Objects.deepEquals(this.expireAt, other.expireAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             status,
             strategy,
             attempts,
@@ -158,9 +156,9 @@ public final static class Builder {
  
         private VerificationStrategy strategy;
  
-        private JsonNullable<? extends Long> attempts = JsonNullable.undefined();
+        private JsonNullable<Long> attempts = JsonNullable.undefined();
  
-        private JsonNullable<? extends Long> expireAt = JsonNullable.undefined();  
+        private JsonNullable<Long> expireAt = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -184,7 +182,7 @@ public Builder attempts(long attempts) {
             return this;
         }
 
-        public Builder attempts(JsonNullable<? extends Long> attempts) {
+        public Builder attempts(JsonNullable<Long> attempts) {
             Utils.checkNotNull(attempts, "attempts");
             this.attempts = attempts;
             return this;
@@ -196,7 +194,7 @@ public Builder expireAt(long expireAt) {
             return this;
         }
 
-        public Builder expireAt(JsonNullable<? extends Long> expireAt) {
+        public Builder expireAt(JsonNullable<Long> expireAt) {
             Utils.checkNotNull(expireAt, "expireAt");
             this.expireAt = expireAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/AdminVerificationPhoneNumberStatus.java b/src/main/java/com/clerk/backend_api/models/components/AdminVerificationPhoneNumberStatus.java
index 0268549..1b39e9a 100644
--- a/src/main/java/com/clerk/backend_api/models/components/AdminVerificationPhoneNumberStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/AdminVerificationPhoneNumberStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum AdminVerificationPhoneNumberStatus {
     VERIFIED("verified");
diff --git a/src/main/java/com/clerk/backend_api/models/components/AdminVerificationStatus.java b/src/main/java/com/clerk/backend_api/models/components/AdminVerificationStatus.java
index 27744f9..d594087 100644
--- a/src/main/java/com/clerk/backend_api/models/components/AdminVerificationStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/AdminVerificationStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum AdminVerificationStatus {
     VERIFIED("verified");
diff --git a/src/main/java/com/clerk/backend_api/models/components/AdminVerificationStrategy.java b/src/main/java/com/clerk/backend_api/models/components/AdminVerificationStrategy.java
index c900945..8e13fa0 100644
--- a/src/main/java/com/clerk/backend_api/models/components/AdminVerificationStrategy.java
+++ b/src/main/java/com/clerk/backend_api/models/components/AdminVerificationStrategy.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum AdminVerificationStrategy {
     ADMIN("admin");
diff --git a/src/main/java/com/clerk/backend_api/models/components/AdminVerificationWeb3WalletStatus.java b/src/main/java/com/clerk/backend_api/models/components/AdminVerificationWeb3WalletStatus.java
index 167a6a3..9728250 100644
--- a/src/main/java/com/clerk/backend_api/models/components/AdminVerificationWeb3WalletStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/AdminVerificationWeb3WalletStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum AdminVerificationWeb3WalletStatus {
     VERIFIED("verified");
diff --git a/src/main/java/com/clerk/backend_api/models/components/AdminVerificationWeb3WalletStrategy.java b/src/main/java/com/clerk/backend_api/models/components/AdminVerificationWeb3WalletStrategy.java
index 2856fe7..b29e0a0 100644
--- a/src/main/java/com/clerk/backend_api/models/components/AdminVerificationWeb3WalletStrategy.java
+++ b/src/main/java/com/clerk/backend_api/models/components/AdminVerificationWeb3WalletStrategy.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum AdminVerificationWeb3WalletStrategy {
     ADMIN("admin");
diff --git a/src/main/java/com/clerk/backend_api/models/components/AllowlistIdentifier.java b/src/main/java/com/clerk/backend_api/models/components/AllowlistIdentifier.java
index bab948c..863ee89 100644
--- a/src/main/java/com/clerk/backend_api/models/components/AllowlistIdentifier.java
+++ b/src/main/java/com/clerk/backend_api/models/components/AllowlistIdentifier.java
@@ -4,20 +4,21 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class AllowlistIdentifier {
 
     /**
@@ -30,11 +31,11 @@ public class AllowlistIdentifier {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("id")
-    private Optional<? extends String> id;
+    private Optional<String> id;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("invitation_id")
-    private Optional<? extends String> invitationId;
+    private Optional<String> invitationId;
 
     /**
      * An email address or a phone number.
@@ -42,7 +43,7 @@ public class AllowlistIdentifier {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("identifier")
-    private Optional<? extends String> identifier;
+    private Optional<String> identifier;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("identifier_type")
@@ -50,7 +51,7 @@ public class AllowlistIdentifier {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("instance_id")
-    private Optional<? extends String> instanceId;
+    private Optional<String> instanceId;
 
     /**
      * Unix timestamp of creation
@@ -58,7 +59,7 @@ public class AllowlistIdentifier {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("created_at")
-    private Optional<? extends Long> createdAt;
+    private Optional<Long> createdAt;
 
     /**
      * Unix timestamp of last update.
@@ -66,18 +67,18 @@ public class AllowlistIdentifier {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("updated_at")
-    private Optional<? extends Long> updatedAt;
+    private Optional<Long> updatedAt;
 
     @JsonCreator
     public AllowlistIdentifier(
             @JsonProperty("object") Optional<? extends AllowlistIdentifierObject> object,
-            @JsonProperty("id") Optional<? extends String> id,
-            @JsonProperty("invitation_id") Optional<? extends String> invitationId,
-            @JsonProperty("identifier") Optional<? extends String> identifier,
+            @JsonProperty("id") Optional<String> id,
+            @JsonProperty("invitation_id") Optional<String> invitationId,
+            @JsonProperty("identifier") Optional<String> identifier,
             @JsonProperty("identifier_type") Optional<? extends IdentifierType> identifierType,
-            @JsonProperty("instance_id") Optional<? extends String> instanceId,
-            @JsonProperty("created_at") Optional<? extends Long> createdAt,
-            @JsonProperty("updated_at") Optional<? extends Long> updatedAt) {
+            @JsonProperty("instance_id") Optional<String> instanceId,
+            @JsonProperty("created_at") Optional<Long> createdAt,
+            @JsonProperty("updated_at") Optional<Long> updatedAt) {
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(id, "id");
         Utils.checkNotNull(invitationId, "invitationId");
@@ -110,26 +111,23 @@ public Optional<AllowlistIdentifierObject> object() {
         return (Optional<AllowlistIdentifierObject>) object;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> id() {
-        return (Optional<String>) id;
+        return id;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> invitationId() {
-        return (Optional<String>) invitationId;
+        return invitationId;
     }
 
     /**
      * An email address or a phone number.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> identifier() {
-        return (Optional<String>) identifier;
+        return identifier;
     }
 
     @SuppressWarnings("unchecked")
@@ -138,30 +136,27 @@ public Optional<IdentifierType> identifierType() {
         return (Optional<IdentifierType>) identifierType;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> instanceId() {
-        return (Optional<String>) instanceId;
+        return instanceId;
     }
 
     /**
      * Unix timestamp of creation
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> createdAt() {
-        return (Optional<Long>) createdAt;
+        return createdAt;
     }
 
     /**
      * Unix timestamp of last update.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> updatedAt() {
-        return (Optional<Long>) updatedAt;
+        return updatedAt;
     }
 
     public final static Builder builder() {
@@ -194,7 +189,7 @@ public AllowlistIdentifier withId(String id) {
         return this;
     }
 
-    public AllowlistIdentifier withId(Optional<? extends String> id) {
+    public AllowlistIdentifier withId(Optional<String> id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
@@ -206,7 +201,7 @@ public AllowlistIdentifier withInvitationId(String invitationId) {
         return this;
     }
 
-    public AllowlistIdentifier withInvitationId(Optional<? extends String> invitationId) {
+    public AllowlistIdentifier withInvitationId(Optional<String> invitationId) {
         Utils.checkNotNull(invitationId, "invitationId");
         this.invitationId = invitationId;
         return this;
@@ -226,7 +221,7 @@ public AllowlistIdentifier withIdentifier(String identifier) {
      * An email address or a phone number.
      * 
      */
-    public AllowlistIdentifier withIdentifier(Optional<? extends String> identifier) {
+    public AllowlistIdentifier withIdentifier(Optional<String> identifier) {
         Utils.checkNotNull(identifier, "identifier");
         this.identifier = identifier;
         return this;
@@ -250,7 +245,7 @@ public AllowlistIdentifier withInstanceId(String instanceId) {
         return this;
     }
 
-    public AllowlistIdentifier withInstanceId(Optional<? extends String> instanceId) {
+    public AllowlistIdentifier withInstanceId(Optional<String> instanceId) {
         Utils.checkNotNull(instanceId, "instanceId");
         this.instanceId = instanceId;
         return this;
@@ -270,7 +265,7 @@ public AllowlistIdentifier withCreatedAt(long createdAt) {
      * Unix timestamp of creation
      * 
      */
-    public AllowlistIdentifier withCreatedAt(Optional<? extends Long> createdAt) {
+    public AllowlistIdentifier withCreatedAt(Optional<Long> createdAt) {
         Utils.checkNotNull(createdAt, "createdAt");
         this.createdAt = createdAt;
         return this;
@@ -290,7 +285,7 @@ public AllowlistIdentifier withUpdatedAt(long updatedAt) {
      * Unix timestamp of last update.
      * 
      */
-    public AllowlistIdentifier withUpdatedAt(Optional<? extends Long> updatedAt) {
+    public AllowlistIdentifier withUpdatedAt(Optional<Long> updatedAt) {
         Utils.checkNotNull(updatedAt, "updatedAt");
         this.updatedAt = updatedAt;
         return this;
@@ -306,19 +301,19 @@ public boolean equals(java.lang.Object o) {
         }
         AllowlistIdentifier other = (AllowlistIdentifier) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.invitationId, other.invitationId) &&
-            java.util.Objects.deepEquals(this.identifier, other.identifier) &&
-            java.util.Objects.deepEquals(this.identifierType, other.identifierType) &&
-            java.util.Objects.deepEquals(this.instanceId, other.instanceId) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.invitationId, other.invitationId) &&
+            Objects.deepEquals(this.identifier, other.identifier) &&
+            Objects.deepEquals(this.identifierType, other.identifierType) &&
+            Objects.deepEquals(this.instanceId, other.instanceId) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             invitationId,
@@ -346,19 +341,19 @@ public final static class Builder {
  
         private Optional<? extends AllowlistIdentifierObject> object = Optional.empty();
  
-        private Optional<? extends String> id = Optional.empty();
+        private Optional<String> id = Optional.empty();
  
-        private Optional<? extends String> invitationId = Optional.empty();
+        private Optional<String> invitationId = Optional.empty();
  
-        private Optional<? extends String> identifier = Optional.empty();
+        private Optional<String> identifier = Optional.empty();
  
         private Optional<? extends IdentifierType> identifierType = Optional.empty();
  
-        private Optional<? extends String> instanceId = Optional.empty();
+        private Optional<String> instanceId = Optional.empty();
  
-        private Optional<? extends Long> createdAt = Optional.empty();
+        private Optional<Long> createdAt = Optional.empty();
  
-        private Optional<? extends Long> updatedAt = Optional.empty();  
+        private Optional<Long> updatedAt = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -390,7 +385,7 @@ public Builder id(String id) {
             return this;
         }
 
-        public Builder id(Optional<? extends String> id) {
+        public Builder id(Optional<String> id) {
             Utils.checkNotNull(id, "id");
             this.id = id;
             return this;
@@ -402,7 +397,7 @@ public Builder invitationId(String invitationId) {
             return this;
         }
 
-        public Builder invitationId(Optional<? extends String> invitationId) {
+        public Builder invitationId(Optional<String> invitationId) {
             Utils.checkNotNull(invitationId, "invitationId");
             this.invitationId = invitationId;
             return this;
@@ -422,7 +417,7 @@ public Builder identifier(String identifier) {
          * An email address or a phone number.
          * 
          */
-        public Builder identifier(Optional<? extends String> identifier) {
+        public Builder identifier(Optional<String> identifier) {
             Utils.checkNotNull(identifier, "identifier");
             this.identifier = identifier;
             return this;
@@ -446,7 +441,7 @@ public Builder instanceId(String instanceId) {
             return this;
         }
 
-        public Builder instanceId(Optional<? extends String> instanceId) {
+        public Builder instanceId(Optional<String> instanceId) {
             Utils.checkNotNull(instanceId, "instanceId");
             this.instanceId = instanceId;
             return this;
@@ -466,7 +461,7 @@ public Builder createdAt(long createdAt) {
          * Unix timestamp of creation
          * 
          */
-        public Builder createdAt(Optional<? extends Long> createdAt) {
+        public Builder createdAt(Optional<Long> createdAt) {
             Utils.checkNotNull(createdAt, "createdAt");
             this.createdAt = createdAt;
             return this;
@@ -486,7 +481,7 @@ public Builder updatedAt(long updatedAt) {
          * Unix timestamp of last update.
          * 
          */
-        public Builder updatedAt(Optional<? extends Long> updatedAt) {
+        public Builder updatedAt(Optional<Long> updatedAt) {
             Utils.checkNotNull(updatedAt, "updatedAt");
             this.updatedAt = updatedAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/AllowlistIdentifierObject.java b/src/main/java/com/clerk/backend_api/models/components/AllowlistIdentifierObject.java
index f3d9836..71abefe 100644
--- a/src/main/java/com/clerk/backend_api/models/components/AllowlistIdentifierObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/AllowlistIdentifierObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * AllowlistIdentifierObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/AttributeMapping.java b/src/main/java/com/clerk/backend_api/models/components/AttributeMapping.java
index 5da325f..c23b596 100644
--- a/src/main/java/com/clerk/backend_api/models/components/AttributeMapping.java
+++ b/src/main/java/com/clerk/backend_api/models/components/AttributeMapping.java
@@ -4,44 +4,43 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class AttributeMapping {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("user_id")
-    private Optional<? extends String> userId;
+    private Optional<String> userId;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("email_address")
-    private Optional<? extends String> emailAddress;
+    private Optional<String> emailAddress;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("first_name")
-    private Optional<? extends String> firstName;
+    private Optional<String> firstName;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("last_name")
-    private Optional<? extends String> lastName;
+    private Optional<String> lastName;
 
     @JsonCreator
     public AttributeMapping(
-            @JsonProperty("user_id") Optional<? extends String> userId,
-            @JsonProperty("email_address") Optional<? extends String> emailAddress,
-            @JsonProperty("first_name") Optional<? extends String> firstName,
-            @JsonProperty("last_name") Optional<? extends String> lastName) {
+            @JsonProperty("user_id") Optional<String> userId,
+            @JsonProperty("email_address") Optional<String> emailAddress,
+            @JsonProperty("first_name") Optional<String> firstName,
+            @JsonProperty("last_name") Optional<String> lastName) {
         Utils.checkNotNull(userId, "userId");
         Utils.checkNotNull(emailAddress, "emailAddress");
         Utils.checkNotNull(firstName, "firstName");
@@ -56,28 +55,24 @@ public AttributeMapping() {
         this(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> userId() {
-        return (Optional<String>) userId;
+        return userId;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> emailAddress() {
-        return (Optional<String>) emailAddress;
+        return emailAddress;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> firstName() {
-        return (Optional<String>) firstName;
+        return firstName;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> lastName() {
-        return (Optional<String>) lastName;
+        return lastName;
     }
 
     public final static Builder builder() {
@@ -90,7 +85,7 @@ public AttributeMapping withUserId(String userId) {
         return this;
     }
 
-    public AttributeMapping withUserId(Optional<? extends String> userId) {
+    public AttributeMapping withUserId(Optional<String> userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
@@ -102,7 +97,7 @@ public AttributeMapping withEmailAddress(String emailAddress) {
         return this;
     }
 
-    public AttributeMapping withEmailAddress(Optional<? extends String> emailAddress) {
+    public AttributeMapping withEmailAddress(Optional<String> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = emailAddress;
         return this;
@@ -114,7 +109,7 @@ public AttributeMapping withFirstName(String firstName) {
         return this;
     }
 
-    public AttributeMapping withFirstName(Optional<? extends String> firstName) {
+    public AttributeMapping withFirstName(Optional<String> firstName) {
         Utils.checkNotNull(firstName, "firstName");
         this.firstName = firstName;
         return this;
@@ -126,7 +121,7 @@ public AttributeMapping withLastName(String lastName) {
         return this;
     }
 
-    public AttributeMapping withLastName(Optional<? extends String> lastName) {
+    public AttributeMapping withLastName(Optional<String> lastName) {
         Utils.checkNotNull(lastName, "lastName");
         this.lastName = lastName;
         return this;
@@ -142,15 +137,15 @@ public boolean equals(java.lang.Object o) {
         }
         AttributeMapping other = (AttributeMapping) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.firstName, other.firstName) &&
-            java.util.Objects.deepEquals(this.lastName, other.lastName);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.firstName, other.firstName) &&
+            Objects.deepEquals(this.lastName, other.lastName);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             emailAddress,
             firstName,
@@ -168,13 +163,13 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> userId = Optional.empty();
+        private Optional<String> userId = Optional.empty();
  
-        private Optional<? extends String> emailAddress = Optional.empty();
+        private Optional<String> emailAddress = Optional.empty();
  
-        private Optional<? extends String> firstName = Optional.empty();
+        private Optional<String> firstName = Optional.empty();
  
-        private Optional<? extends String> lastName = Optional.empty();  
+        private Optional<String> lastName = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -186,7 +181,7 @@ public Builder userId(String userId) {
             return this;
         }
 
-        public Builder userId(Optional<? extends String> userId) {
+        public Builder userId(Optional<String> userId) {
             Utils.checkNotNull(userId, "userId");
             this.userId = userId;
             return this;
@@ -198,7 +193,7 @@ public Builder emailAddress(String emailAddress) {
             return this;
         }
 
-        public Builder emailAddress(Optional<? extends String> emailAddress) {
+        public Builder emailAddress(Optional<String> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = emailAddress;
             return this;
@@ -210,7 +205,7 @@ public Builder firstName(String firstName) {
             return this;
         }
 
-        public Builder firstName(Optional<? extends String> firstName) {
+        public Builder firstName(Optional<String> firstName) {
             Utils.checkNotNull(firstName, "firstName");
             this.firstName = firstName;
             return this;
@@ -222,7 +217,7 @@ public Builder lastName(String lastName) {
             return this;
         }
 
-        public Builder lastName(Optional<? extends String> lastName) {
+        public Builder lastName(Optional<String> lastName) {
             Utils.checkNotNull(lastName, "lastName");
             this.lastName = lastName;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifier.java b/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifier.java
index aee4f50..bddc190 100644
--- a/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifier.java
+++ b/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifier.java
@@ -4,20 +4,21 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class BlocklistIdentifier {
 
     /**
@@ -30,7 +31,7 @@ public class BlocklistIdentifier {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("id")
-    private Optional<? extends String> id;
+    private Optional<String> id;
 
     /**
      * An email address, email domain, phone number or web3 wallet.
@@ -38,7 +39,7 @@ public class BlocklistIdentifier {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("identifier")
-    private Optional<? extends String> identifier;
+    private Optional<String> identifier;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("identifier_type")
@@ -46,7 +47,7 @@ public class BlocklistIdentifier {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("instance_id")
-    private Optional<? extends String> instanceId;
+    private Optional<String> instanceId;
 
     /**
      * Unix timestamp of creation
@@ -54,7 +55,7 @@ public class BlocklistIdentifier {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("created_at")
-    private Optional<? extends Long> createdAt;
+    private Optional<Long> createdAt;
 
     /**
      * Unix timestamp of last update.
@@ -62,17 +63,17 @@ public class BlocklistIdentifier {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("updated_at")
-    private Optional<? extends Long> updatedAt;
+    private Optional<Long> updatedAt;
 
     @JsonCreator
     public BlocklistIdentifier(
             @JsonProperty("object") Optional<? extends BlocklistIdentifierObject> object,
-            @JsonProperty("id") Optional<? extends String> id,
-            @JsonProperty("identifier") Optional<? extends String> identifier,
+            @JsonProperty("id") Optional<String> id,
+            @JsonProperty("identifier") Optional<String> identifier,
             @JsonProperty("identifier_type") Optional<? extends BlocklistIdentifierIdentifierType> identifierType,
-            @JsonProperty("instance_id") Optional<? extends String> instanceId,
-            @JsonProperty("created_at") Optional<? extends Long> createdAt,
-            @JsonProperty("updated_at") Optional<? extends Long> updatedAt) {
+            @JsonProperty("instance_id") Optional<String> instanceId,
+            @JsonProperty("created_at") Optional<Long> createdAt,
+            @JsonProperty("updated_at") Optional<Long> updatedAt) {
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(id, "id");
         Utils.checkNotNull(identifier, "identifier");
@@ -103,20 +104,18 @@ public Optional<BlocklistIdentifierObject> object() {
         return (Optional<BlocklistIdentifierObject>) object;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> id() {
-        return (Optional<String>) id;
+        return id;
     }
 
     /**
      * An email address, email domain, phone number or web3 wallet.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> identifier() {
-        return (Optional<String>) identifier;
+        return identifier;
     }
 
     @SuppressWarnings("unchecked")
@@ -125,30 +124,27 @@ public Optional<BlocklistIdentifierIdentifierType> identifierType() {
         return (Optional<BlocklistIdentifierIdentifierType>) identifierType;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> instanceId() {
-        return (Optional<String>) instanceId;
+        return instanceId;
     }
 
     /**
      * Unix timestamp of creation
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> createdAt() {
-        return (Optional<Long>) createdAt;
+        return createdAt;
     }
 
     /**
      * Unix timestamp of last update.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> updatedAt() {
-        return (Optional<Long>) updatedAt;
+        return updatedAt;
     }
 
     public final static Builder builder() {
@@ -181,7 +177,7 @@ public BlocklistIdentifier withId(String id) {
         return this;
     }
 
-    public BlocklistIdentifier withId(Optional<? extends String> id) {
+    public BlocklistIdentifier withId(Optional<String> id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
@@ -201,7 +197,7 @@ public BlocklistIdentifier withIdentifier(String identifier) {
      * An email address, email domain, phone number or web3 wallet.
      * 
      */
-    public BlocklistIdentifier withIdentifier(Optional<? extends String> identifier) {
+    public BlocklistIdentifier withIdentifier(Optional<String> identifier) {
         Utils.checkNotNull(identifier, "identifier");
         this.identifier = identifier;
         return this;
@@ -225,7 +221,7 @@ public BlocklistIdentifier withInstanceId(String instanceId) {
         return this;
     }
 
-    public BlocklistIdentifier withInstanceId(Optional<? extends String> instanceId) {
+    public BlocklistIdentifier withInstanceId(Optional<String> instanceId) {
         Utils.checkNotNull(instanceId, "instanceId");
         this.instanceId = instanceId;
         return this;
@@ -245,7 +241,7 @@ public BlocklistIdentifier withCreatedAt(long createdAt) {
      * Unix timestamp of creation
      * 
      */
-    public BlocklistIdentifier withCreatedAt(Optional<? extends Long> createdAt) {
+    public BlocklistIdentifier withCreatedAt(Optional<Long> createdAt) {
         Utils.checkNotNull(createdAt, "createdAt");
         this.createdAt = createdAt;
         return this;
@@ -265,7 +261,7 @@ public BlocklistIdentifier withUpdatedAt(long updatedAt) {
      * Unix timestamp of last update.
      * 
      */
-    public BlocklistIdentifier withUpdatedAt(Optional<? extends Long> updatedAt) {
+    public BlocklistIdentifier withUpdatedAt(Optional<Long> updatedAt) {
         Utils.checkNotNull(updatedAt, "updatedAt");
         this.updatedAt = updatedAt;
         return this;
@@ -281,18 +277,18 @@ public boolean equals(java.lang.Object o) {
         }
         BlocklistIdentifier other = (BlocklistIdentifier) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.identifier, other.identifier) &&
-            java.util.Objects.deepEquals(this.identifierType, other.identifierType) &&
-            java.util.Objects.deepEquals(this.instanceId, other.instanceId) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.identifier, other.identifier) &&
+            Objects.deepEquals(this.identifierType, other.identifierType) &&
+            Objects.deepEquals(this.instanceId, other.instanceId) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             identifier,
@@ -318,17 +314,17 @@ public final static class Builder {
  
         private Optional<? extends BlocklistIdentifierObject> object = Optional.empty();
  
-        private Optional<? extends String> id = Optional.empty();
+        private Optional<String> id = Optional.empty();
  
-        private Optional<? extends String> identifier = Optional.empty();
+        private Optional<String> identifier = Optional.empty();
  
         private Optional<? extends BlocklistIdentifierIdentifierType> identifierType = Optional.empty();
  
-        private Optional<? extends String> instanceId = Optional.empty();
+        private Optional<String> instanceId = Optional.empty();
  
-        private Optional<? extends Long> createdAt = Optional.empty();
+        private Optional<Long> createdAt = Optional.empty();
  
-        private Optional<? extends Long> updatedAt = Optional.empty();  
+        private Optional<Long> updatedAt = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -360,7 +356,7 @@ public Builder id(String id) {
             return this;
         }
 
-        public Builder id(Optional<? extends String> id) {
+        public Builder id(Optional<String> id) {
             Utils.checkNotNull(id, "id");
             this.id = id;
             return this;
@@ -380,7 +376,7 @@ public Builder identifier(String identifier) {
          * An email address, email domain, phone number or web3 wallet.
          * 
          */
-        public Builder identifier(Optional<? extends String> identifier) {
+        public Builder identifier(Optional<String> identifier) {
             Utils.checkNotNull(identifier, "identifier");
             this.identifier = identifier;
             return this;
@@ -404,7 +400,7 @@ public Builder instanceId(String instanceId) {
             return this;
         }
 
-        public Builder instanceId(Optional<? extends String> instanceId) {
+        public Builder instanceId(Optional<String> instanceId) {
             Utils.checkNotNull(instanceId, "instanceId");
             this.instanceId = instanceId;
             return this;
@@ -424,7 +420,7 @@ public Builder createdAt(long createdAt) {
          * Unix timestamp of creation
          * 
          */
-        public Builder createdAt(Optional<? extends Long> createdAt) {
+        public Builder createdAt(Optional<Long> createdAt) {
             Utils.checkNotNull(createdAt, "createdAt");
             this.createdAt = createdAt;
             return this;
@@ -444,7 +440,7 @@ public Builder updatedAt(long updatedAt) {
          * Unix timestamp of last update.
          * 
          */
-        public Builder updatedAt(Optional<? extends Long> updatedAt) {
+        public Builder updatedAt(Optional<Long> updatedAt) {
             Utils.checkNotNull(updatedAt, "updatedAt");
             this.updatedAt = updatedAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifierIdentifierType.java b/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifierIdentifierType.java
index 11f6a10..edc2d30 100644
--- a/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifierIdentifierType.java
+++ b/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifierIdentifierType.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum BlocklistIdentifierIdentifierType {
     EMAIL_ADDRESS("email_address"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifierObject.java b/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifierObject.java
index f01f3d4..1064022 100644
--- a/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifierObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifierObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * BlocklistIdentifierObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifiers.java b/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifiers.java
index cbba7b3..48e9f74 100644
--- a/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifiers.java
+++ b/src/main/java/com/clerk/backend_api/models/components/BlocklistIdentifiers.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+
 
 public class BlocklistIdentifiers {
 
     @JsonProperty("data")
-    private java.util.List<BlocklistIdentifier> data;
+    private List<BlocklistIdentifier> data;
 
     /**
      * Total number of blocklist identifiers
@@ -29,7 +30,7 @@ public class BlocklistIdentifiers {
 
     @JsonCreator
     public BlocklistIdentifiers(
-            @JsonProperty("data") java.util.List<BlocklistIdentifier> data,
+            @JsonProperty("data") List<BlocklistIdentifier> data,
             @JsonProperty("total_count") long totalCount) {
         Utils.checkNotNull(data, "data");
         Utils.checkNotNull(totalCount, "totalCount");
@@ -38,7 +39,7 @@ public BlocklistIdentifiers(
     }
 
     @JsonIgnore
-    public java.util.List<BlocklistIdentifier> data() {
+    public List<BlocklistIdentifier> data() {
         return data;
     }
 
@@ -55,7 +56,7 @@ public final static Builder builder() {
         return new Builder();
     }
 
-    public BlocklistIdentifiers withData(java.util.List<BlocklistIdentifier> data) {
+    public BlocklistIdentifiers withData(List<BlocklistIdentifier> data) {
         Utils.checkNotNull(data, "data");
         this.data = data;
         return this;
@@ -81,13 +82,13 @@ public boolean equals(java.lang.Object o) {
         }
         BlocklistIdentifiers other = (BlocklistIdentifiers) o;
         return 
-            java.util.Objects.deepEquals(this.data, other.data) &&
-            java.util.Objects.deepEquals(this.totalCount, other.totalCount);
+            Objects.deepEquals(this.data, other.data) &&
+            Objects.deepEquals(this.totalCount, other.totalCount);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             data,
             totalCount);
     }
@@ -101,7 +102,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private java.util.List<BlocklistIdentifier> data;
+        private List<BlocklistIdentifier> data;
  
         private Long totalCount;  
         
@@ -109,7 +110,7 @@ private Builder() {
           // force use of static builder() method
         }
 
-        public Builder data(java.util.List<BlocklistIdentifier> data) {
+        public Builder data(List<BlocklistIdentifier> data) {
             Utils.checkNotNull(data, "data");
             this.data = data;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/CNameTarget.java b/src/main/java/com/clerk/backend_api/models/components/CNameTarget.java
index d68cabd..883caf4 100644
--- a/src/main/java/com/clerk/backend_api/models/components/CNameTarget.java
+++ b/src/main/java/com/clerk/backend_api/models/components/CNameTarget.java
@@ -4,16 +4,16 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class CNameTarget {
 
@@ -98,14 +98,14 @@ public boolean equals(java.lang.Object o) {
         }
         CNameTarget other = (CNameTarget) o;
         return 
-            java.util.Objects.deepEquals(this.host, other.host) &&
-            java.util.Objects.deepEquals(this.value, other.value) &&
-            java.util.Objects.deepEquals(this.required, other.required);
+            Objects.deepEquals(this.host, other.host) &&
+            Objects.deepEquals(this.value, other.value) &&
+            Objects.deepEquals(this.required, other.required);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             host,
             value,
             required);
diff --git a/src/main/java/com/clerk/backend_api/models/components/Claims.java b/src/main/java/com/clerk/backend_api/models/components/Claims.java
index d611198..3e88fea 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Claims.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Claims.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class Claims {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/ClerkError.java b/src/main/java/com/clerk/backend_api/models/components/ClerkError.java
index b77faf6..7b1f73a 100644
--- a/src/main/java/com/clerk/backend_api/models/components/ClerkError.java
+++ b/src/main/java/com/clerk/backend_api/models/components/ClerkError.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class ClerkError {
 
     @JsonProperty("message")
@@ -35,7 +35,7 @@ public class ClerkError {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("clerk_trace_id")
-    private Optional<? extends String> clerkTraceId;
+    private Optional<String> clerkTraceId;
 
     @JsonCreator
     public ClerkError(
@@ -43,7 +43,7 @@ public ClerkError(
             @JsonProperty("long_message") String longMessage,
             @JsonProperty("code") String code,
             @JsonProperty("meta") Optional<? extends Meta> meta,
-            @JsonProperty("clerk_trace_id") Optional<? extends String> clerkTraceId) {
+            @JsonProperty("clerk_trace_id") Optional<String> clerkTraceId) {
         Utils.checkNotNull(message, "message");
         Utils.checkNotNull(longMessage, "longMessage");
         Utils.checkNotNull(code, "code");
@@ -84,10 +84,9 @@ public Optional<Meta> meta() {
         return (Optional<Meta>) meta;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> clerkTraceId() {
-        return (Optional<String>) clerkTraceId;
+        return clerkTraceId;
     }
 
     public final static Builder builder() {
@@ -130,7 +129,7 @@ public ClerkError withClerkTraceId(String clerkTraceId) {
         return this;
     }
 
-    public ClerkError withClerkTraceId(Optional<? extends String> clerkTraceId) {
+    public ClerkError withClerkTraceId(Optional<String> clerkTraceId) {
         Utils.checkNotNull(clerkTraceId, "clerkTraceId");
         this.clerkTraceId = clerkTraceId;
         return this;
@@ -146,16 +145,16 @@ public boolean equals(java.lang.Object o) {
         }
         ClerkError other = (ClerkError) o;
         return 
-            java.util.Objects.deepEquals(this.message, other.message) &&
-            java.util.Objects.deepEquals(this.longMessage, other.longMessage) &&
-            java.util.Objects.deepEquals(this.code, other.code) &&
-            java.util.Objects.deepEquals(this.meta, other.meta) &&
-            java.util.Objects.deepEquals(this.clerkTraceId, other.clerkTraceId);
+            Objects.deepEquals(this.message, other.message) &&
+            Objects.deepEquals(this.longMessage, other.longMessage) &&
+            Objects.deepEquals(this.code, other.code) &&
+            Objects.deepEquals(this.meta, other.meta) &&
+            Objects.deepEquals(this.clerkTraceId, other.clerkTraceId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             message,
             longMessage,
             code,
@@ -183,7 +182,7 @@ public final static class Builder {
  
         private Optional<? extends Meta> meta = Optional.empty();
  
-        private Optional<? extends String> clerkTraceId = Optional.empty();  
+        private Optional<String> clerkTraceId = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -225,7 +224,7 @@ public Builder clerkTraceId(String clerkTraceId) {
             return this;
         }
 
-        public Builder clerkTraceId(Optional<? extends String> clerkTraceId) {
+        public Builder clerkTraceId(Optional<String> clerkTraceId) {
             Utils.checkNotNull(clerkTraceId, "clerkTraceId");
             this.clerkTraceId = clerkTraceId;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/ClerkErrorErrorMeta.java b/src/main/java/com/clerk/backend_api/models/components/ClerkErrorErrorMeta.java
index 29c2b4c..e0da25e 100644
--- a/src/main/java/com/clerk/backend_api/models/components/ClerkErrorErrorMeta.java
+++ b/src/main/java/com/clerk/backend_api/models/components/ClerkErrorErrorMeta.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class ClerkErrorErrorMeta {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/Client.java b/src/main/java/com/clerk/backend_api/models/components/Client.java
index d894c40..801064f 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Client.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Client.java
@@ -4,20 +4,21 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class Client {
 
     /**
@@ -35,18 +36,18 @@ public class Client {
     private String id;
 
     @JsonProperty("session_ids")
-    private java.util.List<String> sessionIds;
+    private List<String> sessionIds;
 
     @JsonProperty("sessions")
-    private java.util.List<Session> sessions;
+    private List<Session> sessions;
 
     @JsonInclude(Include.ALWAYS)
     @JsonProperty("sign_in_id")
-    private Optional<? extends String> signInId;
+    private Optional<String> signInId;
 
     @JsonInclude(Include.ALWAYS)
     @JsonProperty("sign_up_id")
-    private Optional<? extends String> signUpId;
+    private Optional<String> signUpId;
 
     /**
      * Last active session_id.
@@ -54,7 +55,7 @@ public class Client {
      */
     @JsonInclude(Include.ALWAYS)
     @JsonProperty("last_active_session_id")
-    private Optional<? extends String> lastActiveSessionId;
+    private Optional<String> lastActiveSessionId;
 
     /**
      * Unix timestamp of last update.
@@ -74,11 +75,11 @@ public class Client {
     public Client(
             @JsonProperty("object") Object object,
             @JsonProperty("id") String id,
-            @JsonProperty("session_ids") java.util.List<String> sessionIds,
-            @JsonProperty("sessions") java.util.List<Session> sessions,
-            @JsonProperty("sign_in_id") Optional<? extends String> signInId,
-            @JsonProperty("sign_up_id") Optional<? extends String> signUpId,
-            @JsonProperty("last_active_session_id") Optional<? extends String> lastActiveSessionId,
+            @JsonProperty("session_ids") List<String> sessionIds,
+            @JsonProperty("sessions") List<Session> sessions,
+            @JsonProperty("sign_in_id") Optional<String> signInId,
+            @JsonProperty("sign_up_id") Optional<String> signUpId,
+            @JsonProperty("last_active_session_id") Optional<String> lastActiveSessionId,
             @JsonProperty("updated_at") long updatedAt,
             @JsonProperty("created_at") long createdAt) {
         Utils.checkNotNull(object, "object");
@@ -104,8 +105,8 @@ public Client(
     public Client(
             Object object,
             String id,
-            java.util.List<String> sessionIds,
-            java.util.List<Session> sessions,
+            List<String> sessionIds,
+            List<Session> sessions,
             long updatedAt,
             long createdAt) {
         this(object, id, sessionIds, sessions, Optional.empty(), Optional.empty(), Optional.empty(), updatedAt, createdAt);
@@ -130,35 +131,32 @@ public String id() {
     }
 
     @JsonIgnore
-    public java.util.List<String> sessionIds() {
+    public List<String> sessionIds() {
         return sessionIds;
     }
 
     @JsonIgnore
-    public java.util.List<Session> sessions() {
+    public List<Session> sessions() {
         return sessions;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> signInId() {
-        return (Optional<String>) signInId;
+        return signInId;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> signUpId() {
-        return (Optional<String>) signUpId;
+        return signUpId;
     }
 
     /**
      * Last active session_id.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> lastActiveSessionId() {
-        return (Optional<String>) lastActiveSessionId;
+        return lastActiveSessionId;
     }
 
     /**
@@ -203,13 +201,13 @@ public Client withId(String id) {
         return this;
     }
 
-    public Client withSessionIds(java.util.List<String> sessionIds) {
+    public Client withSessionIds(List<String> sessionIds) {
         Utils.checkNotNull(sessionIds, "sessionIds");
         this.sessionIds = sessionIds;
         return this;
     }
 
-    public Client withSessions(java.util.List<Session> sessions) {
+    public Client withSessions(List<Session> sessions) {
         Utils.checkNotNull(sessions, "sessions");
         this.sessions = sessions;
         return this;
@@ -221,7 +219,7 @@ public Client withSignInId(String signInId) {
         return this;
     }
 
-    public Client withSignInId(Optional<? extends String> signInId) {
+    public Client withSignInId(Optional<String> signInId) {
         Utils.checkNotNull(signInId, "signInId");
         this.signInId = signInId;
         return this;
@@ -233,7 +231,7 @@ public Client withSignUpId(String signUpId) {
         return this;
     }
 
-    public Client withSignUpId(Optional<? extends String> signUpId) {
+    public Client withSignUpId(Optional<String> signUpId) {
         Utils.checkNotNull(signUpId, "signUpId");
         this.signUpId = signUpId;
         return this;
@@ -253,7 +251,7 @@ public Client withLastActiveSessionId(String lastActiveSessionId) {
      * Last active session_id.
      * 
      */
-    public Client withLastActiveSessionId(Optional<? extends String> lastActiveSessionId) {
+    public Client withLastActiveSessionId(Optional<String> lastActiveSessionId) {
         Utils.checkNotNull(lastActiveSessionId, "lastActiveSessionId");
         this.lastActiveSessionId = lastActiveSessionId;
         return this;
@@ -289,20 +287,20 @@ public boolean equals(java.lang.Object o) {
         }
         Client other = (Client) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.sessionIds, other.sessionIds) &&
-            java.util.Objects.deepEquals(this.sessions, other.sessions) &&
-            java.util.Objects.deepEquals(this.signInId, other.signInId) &&
-            java.util.Objects.deepEquals(this.signUpId, other.signUpId) &&
-            java.util.Objects.deepEquals(this.lastActiveSessionId, other.lastActiveSessionId) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.sessionIds, other.sessionIds) &&
+            Objects.deepEquals(this.sessions, other.sessions) &&
+            Objects.deepEquals(this.signInId, other.signInId) &&
+            Objects.deepEquals(this.signUpId, other.signUpId) &&
+            Objects.deepEquals(this.lastActiveSessionId, other.lastActiveSessionId) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt) &&
+            Objects.deepEquals(this.createdAt, other.createdAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             sessionIds,
@@ -334,15 +332,15 @@ public final static class Builder {
  
         private String id;
  
-        private java.util.List<String> sessionIds;
+        private List<String> sessionIds;
  
-        private java.util.List<Session> sessions;
+        private List<Session> sessions;
  
-        private Optional<? extends String> signInId = Optional.empty();
+        private Optional<String> signInId = Optional.empty();
  
-        private Optional<? extends String> signUpId = Optional.empty();
+        private Optional<String> signUpId = Optional.empty();
  
-        private Optional<? extends String> lastActiveSessionId = Optional.empty();
+        private Optional<String> lastActiveSessionId = Optional.empty();
  
         private Long updatedAt;
  
@@ -372,13 +370,13 @@ public Builder id(String id) {
             return this;
         }
 
-        public Builder sessionIds(java.util.List<String> sessionIds) {
+        public Builder sessionIds(List<String> sessionIds) {
             Utils.checkNotNull(sessionIds, "sessionIds");
             this.sessionIds = sessionIds;
             return this;
         }
 
-        public Builder sessions(java.util.List<Session> sessions) {
+        public Builder sessions(List<Session> sessions) {
             Utils.checkNotNull(sessions, "sessions");
             this.sessions = sessions;
             return this;
@@ -390,7 +388,7 @@ public Builder signInId(String signInId) {
             return this;
         }
 
-        public Builder signInId(Optional<? extends String> signInId) {
+        public Builder signInId(Optional<String> signInId) {
             Utils.checkNotNull(signInId, "signInId");
             this.signInId = signInId;
             return this;
@@ -402,7 +400,7 @@ public Builder signUpId(String signUpId) {
             return this;
         }
 
-        public Builder signUpId(Optional<? extends String> signUpId) {
+        public Builder signUpId(Optional<String> signUpId) {
             Utils.checkNotNull(signUpId, "signUpId");
             this.signUpId = signUpId;
             return this;
@@ -422,7 +420,7 @@ public Builder lastActiveSessionId(String lastActiveSessionId) {
          * Last active session_id.
          * 
          */
-        public Builder lastActiveSessionId(Optional<? extends String> lastActiveSessionId) {
+        public Builder lastActiveSessionId(Optional<String> lastActiveSessionId) {
             Utils.checkNotNull(lastActiveSessionId, "lastActiveSessionId");
             this.lastActiveSessionId = lastActiveSessionId;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/DeletedObject.java b/src/main/java/com/clerk/backend_api/models/components/DeletedObject.java
index d231e08..6a359be 100644
--- a/src/main/java/com/clerk/backend_api/models/components/DeletedObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/DeletedObject.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class DeletedObject {
 
     @JsonProperty("object")
@@ -25,11 +25,11 @@ public class DeletedObject {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("id")
-    private Optional<? extends String> id;
+    private Optional<String> id;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("slug")
-    private Optional<? extends String> slug;
+    private Optional<String> slug;
 
     @JsonProperty("deleted")
     private boolean deleted;
@@ -37,8 +37,8 @@ public class DeletedObject {
     @JsonCreator
     public DeletedObject(
             @JsonProperty("object") String object,
-            @JsonProperty("id") Optional<? extends String> id,
-            @JsonProperty("slug") Optional<? extends String> slug,
+            @JsonProperty("id") Optional<String> id,
+            @JsonProperty("slug") Optional<String> slug,
             @JsonProperty("deleted") boolean deleted) {
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(id, "id");
@@ -61,16 +61,14 @@ public String object() {
         return object;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> id() {
-        return (Optional<String>) id;
+        return id;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> slug() {
-        return (Optional<String>) slug;
+        return slug;
     }
 
     @JsonIgnore
@@ -94,7 +92,7 @@ public DeletedObject withId(String id) {
         return this;
     }
 
-    public DeletedObject withId(Optional<? extends String> id) {
+    public DeletedObject withId(Optional<String> id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
@@ -106,7 +104,7 @@ public DeletedObject withSlug(String slug) {
         return this;
     }
 
-    public DeletedObject withSlug(Optional<? extends String> slug) {
+    public DeletedObject withSlug(Optional<String> slug) {
         Utils.checkNotNull(slug, "slug");
         this.slug = slug;
         return this;
@@ -128,15 +126,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeletedObject other = (DeletedObject) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.slug, other.slug) &&
-            java.util.Objects.deepEquals(this.deleted, other.deleted);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.slug, other.slug) &&
+            Objects.deepEquals(this.deleted, other.deleted);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             slug,
@@ -156,9 +154,9 @@ public final static class Builder {
  
         private String object;
  
-        private Optional<? extends String> id = Optional.empty();
+        private Optional<String> id = Optional.empty();
  
-        private Optional<? extends String> slug = Optional.empty();
+        private Optional<String> slug = Optional.empty();
  
         private Boolean deleted;  
         
@@ -178,7 +176,7 @@ public Builder id(String id) {
             return this;
         }
 
-        public Builder id(Optional<? extends String> id) {
+        public Builder id(Optional<String> id) {
             Utils.checkNotNull(id, "id");
             this.id = id;
             return this;
@@ -190,7 +188,7 @@ public Builder slug(String slug) {
             return this;
         }
 
-        public Builder slug(Optional<? extends String> slug) {
+        public Builder slug(Optional<String> slug) {
             Utils.checkNotNull(slug, "slug");
             this.slug = slug;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/Domain.java b/src/main/java/com/clerk/backend_api/models/components/Domain.java
index a33f9bf..97f79bd 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Domain.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Domain.java
@@ -4,20 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class Domain {
 
     @JsonProperty("object")
@@ -41,18 +43,18 @@ public class Domain {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("accounts_portal_url")
-    private JsonNullable<? extends String> accountsPortalUrl;
+    private JsonNullable<String> accountsPortalUrl;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("proxy_url")
-    private JsonNullable<? extends String> proxyUrl;
+    private JsonNullable<String> proxyUrl;
 
     @JsonProperty("development_origin")
     private String developmentOrigin;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("cname_targets")
-    private JsonNullable<? extends java.util.List<CNameTarget>> cnameTargets;
+    private JsonNullable<? extends List<CNameTarget>> cnameTargets;
 
     @JsonCreator
     public Domain(
@@ -61,10 +63,10 @@ public Domain(
             @JsonProperty("name") String name,
             @JsonProperty("is_satellite") boolean isSatellite,
             @JsonProperty("frontend_api_url") String frontendApiUrl,
-            @JsonProperty("accounts_portal_url") JsonNullable<? extends String> accountsPortalUrl,
-            @JsonProperty("proxy_url") JsonNullable<? extends String> proxyUrl,
+            @JsonProperty("accounts_portal_url") JsonNullable<String> accountsPortalUrl,
+            @JsonProperty("proxy_url") JsonNullable<String> proxyUrl,
             @JsonProperty("development_origin") String developmentOrigin,
-            @JsonProperty("cname_targets") JsonNullable<? extends java.util.List<CNameTarget>> cnameTargets) {
+            @JsonProperty("cname_targets") JsonNullable<? extends List<CNameTarget>> cnameTargets) {
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(id, "id");
         Utils.checkNotNull(name, "name");
@@ -124,16 +126,14 @@ public String frontendApiUrl() {
      * Null for satellite domains.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> accountsPortalUrl() {
-        return (JsonNullable<String>) accountsPortalUrl;
+        return accountsPortalUrl;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> proxyUrl() {
-        return (JsonNullable<String>) proxyUrl;
+        return proxyUrl;
     }
 
     @JsonIgnore
@@ -143,8 +143,8 @@ public String developmentOrigin() {
 
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public JsonNullable<java.util.List<CNameTarget>> cnameTargets() {
-        return (JsonNullable<java.util.List<CNameTarget>>) cnameTargets;
+    public JsonNullable<List<CNameTarget>> cnameTargets() {
+        return (JsonNullable<List<CNameTarget>>) cnameTargets;
     }
 
     public final static Builder builder() {
@@ -195,7 +195,7 @@ public Domain withAccountsPortalUrl(String accountsPortalUrl) {
      * Null for satellite domains.
      * 
      */
-    public Domain withAccountsPortalUrl(JsonNullable<? extends String> accountsPortalUrl) {
+    public Domain withAccountsPortalUrl(JsonNullable<String> accountsPortalUrl) {
         Utils.checkNotNull(accountsPortalUrl, "accountsPortalUrl");
         this.accountsPortalUrl = accountsPortalUrl;
         return this;
@@ -207,7 +207,7 @@ public Domain withProxyUrl(String proxyUrl) {
         return this;
     }
 
-    public Domain withProxyUrl(JsonNullable<? extends String> proxyUrl) {
+    public Domain withProxyUrl(JsonNullable<String> proxyUrl) {
         Utils.checkNotNull(proxyUrl, "proxyUrl");
         this.proxyUrl = proxyUrl;
         return this;
@@ -219,13 +219,13 @@ public Domain withDevelopmentOrigin(String developmentOrigin) {
         return this;
     }
 
-    public Domain withCnameTargets(java.util.List<CNameTarget> cnameTargets) {
+    public Domain withCnameTargets(List<CNameTarget> cnameTargets) {
         Utils.checkNotNull(cnameTargets, "cnameTargets");
         this.cnameTargets = JsonNullable.of(cnameTargets);
         return this;
     }
 
-    public Domain withCnameTargets(JsonNullable<? extends java.util.List<CNameTarget>> cnameTargets) {
+    public Domain withCnameTargets(JsonNullable<? extends List<CNameTarget>> cnameTargets) {
         Utils.checkNotNull(cnameTargets, "cnameTargets");
         this.cnameTargets = cnameTargets;
         return this;
@@ -241,20 +241,20 @@ public boolean equals(java.lang.Object o) {
         }
         Domain other = (Domain) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.isSatellite, other.isSatellite) &&
-            java.util.Objects.deepEquals(this.frontendApiUrl, other.frontendApiUrl) &&
-            java.util.Objects.deepEquals(this.accountsPortalUrl, other.accountsPortalUrl) &&
-            java.util.Objects.deepEquals(this.proxyUrl, other.proxyUrl) &&
-            java.util.Objects.deepEquals(this.developmentOrigin, other.developmentOrigin) &&
-            java.util.Objects.deepEquals(this.cnameTargets, other.cnameTargets);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.isSatellite, other.isSatellite) &&
+            Objects.deepEquals(this.frontendApiUrl, other.frontendApiUrl) &&
+            Objects.deepEquals(this.accountsPortalUrl, other.accountsPortalUrl) &&
+            Objects.deepEquals(this.proxyUrl, other.proxyUrl) &&
+            Objects.deepEquals(this.developmentOrigin, other.developmentOrigin) &&
+            Objects.deepEquals(this.cnameTargets, other.cnameTargets);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             name,
@@ -292,13 +292,13 @@ public final static class Builder {
  
         private String frontendApiUrl;
  
-        private JsonNullable<? extends String> accountsPortalUrl = JsonNullable.undefined();
+        private JsonNullable<String> accountsPortalUrl = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> proxyUrl = JsonNullable.undefined();
+        private JsonNullable<String> proxyUrl = JsonNullable.undefined();
  
         private String developmentOrigin;
  
-        private JsonNullable<? extends java.util.List<CNameTarget>> cnameTargets = JsonNullable.undefined();  
+        private JsonNullable<? extends List<CNameTarget>> cnameTargets = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -348,7 +348,7 @@ public Builder accountsPortalUrl(String accountsPortalUrl) {
          * Null for satellite domains.
          * 
          */
-        public Builder accountsPortalUrl(JsonNullable<? extends String> accountsPortalUrl) {
+        public Builder accountsPortalUrl(JsonNullable<String> accountsPortalUrl) {
             Utils.checkNotNull(accountsPortalUrl, "accountsPortalUrl");
             this.accountsPortalUrl = accountsPortalUrl;
             return this;
@@ -360,7 +360,7 @@ public Builder proxyUrl(String proxyUrl) {
             return this;
         }
 
-        public Builder proxyUrl(JsonNullable<? extends String> proxyUrl) {
+        public Builder proxyUrl(JsonNullable<String> proxyUrl) {
             Utils.checkNotNull(proxyUrl, "proxyUrl");
             this.proxyUrl = proxyUrl;
             return this;
@@ -372,13 +372,13 @@ public Builder developmentOrigin(String developmentOrigin) {
             return this;
         }
 
-        public Builder cnameTargets(java.util.List<CNameTarget> cnameTargets) {
+        public Builder cnameTargets(List<CNameTarget> cnameTargets) {
             Utils.checkNotNull(cnameTargets, "cnameTargets");
             this.cnameTargets = JsonNullable.of(cnameTargets);
             return this;
         }
 
-        public Builder cnameTargets(JsonNullable<? extends java.util.List<CNameTarget>> cnameTargets) {
+        public Builder cnameTargets(JsonNullable<? extends List<CNameTarget>> cnameTargets) {
             Utils.checkNotNull(cnameTargets, "cnameTargets");
             this.cnameTargets = cnameTargets;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/DomainObject.java b/src/main/java/com/clerk/backend_api/models/components/DomainObject.java
index 46291b3..6703a24 100644
--- a/src/main/java/com/clerk/backend_api/models/components/DomainObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/DomainObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum DomainObject {
     DOMAIN("domain");
diff --git a/src/main/java/com/clerk/backend_api/models/components/Domains.java b/src/main/java/com/clerk/backend_api/models/components/Domains.java
index 6453877..7335503 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Domains.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Domains.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+
 
 public class Domains {
 
     @JsonProperty("data")
-    private java.util.List<Domain> data;
+    private List<Domain> data;
 
     /**
      * Total number of domains
@@ -29,7 +30,7 @@ public class Domains {
 
     @JsonCreator
     public Domains(
-            @JsonProperty("data") java.util.List<Domain> data,
+            @JsonProperty("data") List<Domain> data,
             @JsonProperty("total_count") long totalCount) {
         Utils.checkNotNull(data, "data");
         Utils.checkNotNull(totalCount, "totalCount");
@@ -38,7 +39,7 @@ public Domains(
     }
 
     @JsonIgnore
-    public java.util.List<Domain> data() {
+    public List<Domain> data() {
         return data;
     }
 
@@ -55,7 +56,7 @@ public final static Builder builder() {
         return new Builder();
     }
 
-    public Domains withData(java.util.List<Domain> data) {
+    public Domains withData(List<Domain> data) {
         Utils.checkNotNull(data, "data");
         this.data = data;
         return this;
@@ -81,13 +82,13 @@ public boolean equals(java.lang.Object o) {
         }
         Domains other = (Domains) o;
         return 
-            java.util.Objects.deepEquals(this.data, other.data) &&
-            java.util.Objects.deepEquals(this.totalCount, other.totalCount);
+            Objects.deepEquals(this.data, other.data) &&
+            Objects.deepEquals(this.totalCount, other.totalCount);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             data,
             totalCount);
     }
@@ -101,7 +102,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private java.util.List<Domain> data;
+        private List<Domain> data;
  
         private Long totalCount;  
         
@@ -109,7 +110,7 @@ private Builder() {
           // force use of static builder() method
         }
 
-        public Builder data(java.util.List<Domain> data) {
+        public Builder data(List<Domain> data) {
             Utils.checkNotNull(data, "data");
             this.data = data;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/DomainsEnrollmentModes.java b/src/main/java/com/clerk/backend_api/models/components/DomainsEnrollmentModes.java
index c1c177f..926373a 100644
--- a/src/main/java/com/clerk/backend_api/models/components/DomainsEnrollmentModes.java
+++ b/src/main/java/com/clerk/backend_api/models/components/DomainsEnrollmentModes.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum DomainsEnrollmentModes {
     MANUAL_INVITATION("manual_invitation"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/EmailAddress.java b/src/main/java/com/clerk/backend_api/models/components/EmailAddress.java
index 8ebb9c8..78fc91b 100644
--- a/src/main/java/com/clerk/backend_api/models/components/EmailAddress.java
+++ b/src/main/java/com/clerk/backend_api/models/components/EmailAddress.java
@@ -4,25 +4,28 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class EmailAddress {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("id")
-    private Optional<? extends String> id;
+    private Optional<String> id;
 
     /**
      * String representing the object's type. Objects of the same type share the same value.
@@ -42,7 +45,7 @@ public class EmailAddress {
     private Optional<? extends Verification> verification;
 
     @JsonProperty("linked_to")
-    private java.util.List<IdentificationLink> linkedTo;
+    private List<IdentificationLink> linkedTo;
 
     /**
      * Unix timestamp of creation
@@ -60,12 +63,12 @@ public class EmailAddress {
 
     @JsonCreator
     public EmailAddress(
-            @JsonProperty("id") Optional<? extends String> id,
+            @JsonProperty("id") Optional<String> id,
             @JsonProperty("object") EmailAddressObject object,
             @JsonProperty("email_address") String emailAddress,
             @JsonProperty("reserved") boolean reserved,
             @JsonProperty("verification") Optional<? extends Verification> verification,
-            @JsonProperty("linked_to") java.util.List<IdentificationLink> linkedTo,
+            @JsonProperty("linked_to") List<IdentificationLink> linkedTo,
             @JsonProperty("created_at") long createdAt,
             @JsonProperty("updated_at") long updatedAt) {
         Utils.checkNotNull(id, "id");
@@ -90,16 +93,15 @@ public EmailAddress(
             EmailAddressObject object,
             String emailAddress,
             boolean reserved,
-            java.util.List<IdentificationLink> linkedTo,
+            List<IdentificationLink> linkedTo,
             long createdAt,
             long updatedAt) {
         this(Optional.empty(), object, emailAddress, reserved, Optional.empty(), linkedTo, createdAt, updatedAt);
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> id() {
-        return (Optional<String>) id;
+        return id;
     }
 
     /**
@@ -128,7 +130,7 @@ public Optional<Verification> verification() {
     }
 
     @JsonIgnore
-    public java.util.List<IdentificationLink> linkedTo() {
+    public List<IdentificationLink> linkedTo() {
         return linkedTo;
     }
 
@@ -160,7 +162,7 @@ public EmailAddress withId(String id) {
         return this;
     }
 
-    public EmailAddress withId(Optional<? extends String> id) {
+    public EmailAddress withId(Optional<String> id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
@@ -200,7 +202,7 @@ public EmailAddress withVerification(Optional<? extends Verification> verificati
         return this;
     }
 
-    public EmailAddress withLinkedTo(java.util.List<IdentificationLink> linkedTo) {
+    public EmailAddress withLinkedTo(List<IdentificationLink> linkedTo) {
         Utils.checkNotNull(linkedTo, "linkedTo");
         this.linkedTo = linkedTo;
         return this;
@@ -236,19 +238,19 @@ public boolean equals(java.lang.Object o) {
         }
         EmailAddress other = (EmailAddress) o;
         return 
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.reserved, other.reserved) &&
-            java.util.Objects.deepEquals(this.verification, other.verification) &&
-            java.util.Objects.deepEquals(this.linkedTo, other.linkedTo) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.reserved, other.reserved) &&
+            Objects.deepEquals(this.verification, other.verification) &&
+            Objects.deepEquals(this.linkedTo, other.linkedTo) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             id,
             object,
             emailAddress,
@@ -274,7 +276,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> id = Optional.empty();
+        private Optional<String> id = Optional.empty();
  
         private EmailAddressObject object;
  
@@ -284,7 +286,7 @@ public final static class Builder {
  
         private Optional<? extends Verification> verification = Optional.empty();
  
-        private java.util.List<IdentificationLink> linkedTo;
+        private List<IdentificationLink> linkedTo;
  
         private Long createdAt;
  
@@ -300,7 +302,7 @@ public Builder id(String id) {
             return this;
         }
 
-        public Builder id(Optional<? extends String> id) {
+        public Builder id(Optional<String> id) {
             Utils.checkNotNull(id, "id");
             this.id = id;
             return this;
@@ -340,7 +342,7 @@ public Builder verification(Optional<? extends Verification> verification) {
             return this;
         }
 
-        public Builder linkedTo(java.util.List<IdentificationLink> linkedTo) {
+        public Builder linkedTo(List<IdentificationLink> linkedTo) {
             Utils.checkNotNull(linkedTo, "linkedTo");
             this.linkedTo = linkedTo;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/EmailAddressObject.java b/src/main/java/com/clerk/backend_api/models/components/EmailAddressObject.java
index f3bfb00..788a9d3 100644
--- a/src/main/java/com/clerk/backend_api/models/components/EmailAddressObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/EmailAddressObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * EmailAddressObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/Error.java b/src/main/java/com/clerk/backend_api/models/components/Error.java
index dcf44ce..2e933c5 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Error.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Error.java
@@ -4,28 +4,25 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
 
-import java.time.OffsetDateTime;
-import java.time.LocalDate;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.clerk.backend_api.utils.OneOfDeserializer;
 import com.clerk.backend_api.utils.TypedObject;
 import com.clerk.backend_api.utils.Utils.JsonShape;
+import com.clerk.backend_api.utils.Utils.TypeReferenceWithShape;
+import com.clerk.backend_api.utils.Utils;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 
 
 @JsonDeserialize(using = Error._Deserializer.class)
 public class Error {
 
-    @com.fasterxml.jackson.annotation.JsonValue
+    @JsonValue
     private TypedObject value;
     
     private Error(TypedObject value) {
@@ -40,7 +37,7 @@ public static Error of(ErrorClerkError value) {
     /**
      * Returns an instance of one of these types:
      * <ul>
-     * <li>{@code ErrorClerkError}</li>
+     * <li>{@code com.clerk.backend_api.models.components.ErrorClerkError}</li>
      * </ul>
      * 
      * <p>Use {@code instanceof} to determine what type is returned. For example:
@@ -67,20 +64,20 @@ public boolean equals(java.lang.Object o) {
             return false;
         }
         Error other = (Error) o;
-        return java.util.Objects.deepEquals(this.value.value(), other.value.value()); 
+        return Objects.deepEquals(this.value.value(), other.value.value()); 
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(value.value());
+        return Objects.hash(value.value());
     }
     
     @SuppressWarnings("serial")
-    public static final class _Deserializer extends com.clerk.backend_api.utils.OneOfDeserializer<Error> {
+    public static final class _Deserializer extends OneOfDeserializer<Error> {
 
         public _Deserializer() {
             super(Error.class,
-                  Utils.TypeReferenceWithShape.of(new TypeReference<ErrorClerkError>() {}, Utils.JsonShape.DEFAULT));
+                  TypeReferenceWithShape.of(new TypeReference<com.clerk.backend_api.models.components.ErrorClerkError>() {}, JsonShape.DEFAULT));
         }
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/ErrorClerkError.java b/src/main/java/com/clerk/backend_api/models/components/ErrorClerkError.java
index 1c9736f..11256ec 100644
--- a/src/main/java/com/clerk/backend_api/models/components/ErrorClerkError.java
+++ b/src/main/java/com/clerk/backend_api/models/components/ErrorClerkError.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class ErrorClerkError {
 
     @JsonProperty("message")
@@ -35,7 +35,7 @@ public class ErrorClerkError {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("clerk_trace_id")
-    private Optional<? extends String> clerkTraceId;
+    private Optional<String> clerkTraceId;
 
     @JsonCreator
     public ErrorClerkError(
@@ -43,7 +43,7 @@ public ErrorClerkError(
             @JsonProperty("long_message") String longMessage,
             @JsonProperty("code") String code,
             @JsonProperty("meta") Optional<? extends ErrorMeta> meta,
-            @JsonProperty("clerk_trace_id") Optional<? extends String> clerkTraceId) {
+            @JsonProperty("clerk_trace_id") Optional<String> clerkTraceId) {
         Utils.checkNotNull(message, "message");
         Utils.checkNotNull(longMessage, "longMessage");
         Utils.checkNotNull(code, "code");
@@ -84,10 +84,9 @@ public Optional<ErrorMeta> meta() {
         return (Optional<ErrorMeta>) meta;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> clerkTraceId() {
-        return (Optional<String>) clerkTraceId;
+        return clerkTraceId;
     }
 
     public final static Builder builder() {
@@ -130,7 +129,7 @@ public ErrorClerkError withClerkTraceId(String clerkTraceId) {
         return this;
     }
 
-    public ErrorClerkError withClerkTraceId(Optional<? extends String> clerkTraceId) {
+    public ErrorClerkError withClerkTraceId(Optional<String> clerkTraceId) {
         Utils.checkNotNull(clerkTraceId, "clerkTraceId");
         this.clerkTraceId = clerkTraceId;
         return this;
@@ -146,16 +145,16 @@ public boolean equals(java.lang.Object o) {
         }
         ErrorClerkError other = (ErrorClerkError) o;
         return 
-            java.util.Objects.deepEquals(this.message, other.message) &&
-            java.util.Objects.deepEquals(this.longMessage, other.longMessage) &&
-            java.util.Objects.deepEquals(this.code, other.code) &&
-            java.util.Objects.deepEquals(this.meta, other.meta) &&
-            java.util.Objects.deepEquals(this.clerkTraceId, other.clerkTraceId);
+            Objects.deepEquals(this.message, other.message) &&
+            Objects.deepEquals(this.longMessage, other.longMessage) &&
+            Objects.deepEquals(this.code, other.code) &&
+            Objects.deepEquals(this.meta, other.meta) &&
+            Objects.deepEquals(this.clerkTraceId, other.clerkTraceId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             message,
             longMessage,
             code,
@@ -183,7 +182,7 @@ public final static class Builder {
  
         private Optional<? extends ErrorMeta> meta = Optional.empty();
  
-        private Optional<? extends String> clerkTraceId = Optional.empty();  
+        private Optional<String> clerkTraceId = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -225,7 +224,7 @@ public Builder clerkTraceId(String clerkTraceId) {
             return this;
         }
 
-        public Builder clerkTraceId(Optional<? extends String> clerkTraceId) {
+        public Builder clerkTraceId(Optional<String> clerkTraceId) {
             Utils.checkNotNull(clerkTraceId, "clerkTraceId");
             this.clerkTraceId = clerkTraceId;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/ErrorMeta.java b/src/main/java/com/clerk/backend_api/models/components/ErrorMeta.java
index 679ae0d..6e46511 100644
--- a/src/main/java/com/clerk/backend_api/models/components/ErrorMeta.java
+++ b/src/main/java/com/clerk/backend_api/models/components/ErrorMeta.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class ErrorMeta {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/ExternalAccount.java b/src/main/java/com/clerk/backend_api/models/components/ExternalAccount.java
index 982f4ce..8ddfccc 100644
--- a/src/main/java/com/clerk/backend_api/models/components/ExternalAccount.java
+++ b/src/main/java/com/clerk/backend_api/models/components/ExternalAccount.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class ExternalAccount {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/ExternalAccounts.java b/src/main/java/com/clerk/backend_api/models/components/ExternalAccounts.java
index 7b5f78a..622027f 100644
--- a/src/main/java/com/clerk/backend_api/models/components/ExternalAccounts.java
+++ b/src/main/java/com/clerk/backend_api/models/components/ExternalAccounts.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class ExternalAccounts {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/IdentificationLink.java b/src/main/java/com/clerk/backend_api/models/components/IdentificationLink.java
index 58e68aa..b074118 100644
--- a/src/main/java/com/clerk/backend_api/models/components/IdentificationLink.java
+++ b/src/main/java/com/clerk/backend_api/models/components/IdentificationLink.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class IdentificationLink {
 
@@ -69,13 +68,13 @@ public boolean equals(java.lang.Object o) {
         }
         IdentificationLink other = (IdentificationLink) o;
         return 
-            java.util.Objects.deepEquals(this.type, other.type) &&
-            java.util.Objects.deepEquals(this.id, other.id);
+            Objects.deepEquals(this.type, other.type) &&
+            Objects.deepEquals(this.id, other.id);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             type,
             id);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/components/IdentifierType.java b/src/main/java/com/clerk/backend_api/models/components/IdentifierType.java
index 754fb46..2a27975 100644
--- a/src/main/java/com/clerk/backend_api/models/components/IdentifierType.java
+++ b/src/main/java/com/clerk/backend_api/models/components/IdentifierType.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum IdentifierType {
     EMAIL_ADDRESS("email_address"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/InstanceRestrictions.java b/src/main/java/com/clerk/backend_api/models/components/InstanceRestrictions.java
index d41272e..5c54069 100644
--- a/src/main/java/com/clerk/backend_api/models/components/InstanceRestrictions.java
+++ b/src/main/java/com/clerk/backend_api/models/components/InstanceRestrictions.java
@@ -4,20 +4,21 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class InstanceRestrictions {
 
     /**
@@ -29,27 +30,27 @@ public class InstanceRestrictions {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("allowlist")
-    private Optional<? extends Boolean> allowlist;
+    private Optional<Boolean> allowlist;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("blocklist")
-    private Optional<? extends Boolean> blocklist;
+    private Optional<Boolean> blocklist;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("block_email_subaddresses")
-    private Optional<? extends Boolean> blockEmailSubaddresses;
+    private Optional<Boolean> blockEmailSubaddresses;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("ignore_dots_for_gmail_addresses")
-    private Optional<? extends Boolean> ignoreDotsForGmailAddresses;
+    private Optional<Boolean> ignoreDotsForGmailAddresses;
 
     @JsonCreator
     public InstanceRestrictions(
             @JsonProperty("object") Optional<? extends InstanceRestrictionsObject> object,
-            @JsonProperty("allowlist") Optional<? extends Boolean> allowlist,
-            @JsonProperty("blocklist") Optional<? extends Boolean> blocklist,
-            @JsonProperty("block_email_subaddresses") Optional<? extends Boolean> blockEmailSubaddresses,
-            @JsonProperty("ignore_dots_for_gmail_addresses") Optional<? extends Boolean> ignoreDotsForGmailAddresses) {
+            @JsonProperty("allowlist") Optional<Boolean> allowlist,
+            @JsonProperty("blocklist") Optional<Boolean> blocklist,
+            @JsonProperty("block_email_subaddresses") Optional<Boolean> blockEmailSubaddresses,
+            @JsonProperty("ignore_dots_for_gmail_addresses") Optional<Boolean> ignoreDotsForGmailAddresses) {
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(allowlist, "allowlist");
         Utils.checkNotNull(blocklist, "blocklist");
@@ -75,28 +76,24 @@ public Optional<InstanceRestrictionsObject> object() {
         return (Optional<InstanceRestrictionsObject>) object;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> allowlist() {
-        return (Optional<Boolean>) allowlist;
+        return allowlist;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> blocklist() {
-        return (Optional<Boolean>) blocklist;
+        return blocklist;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> blockEmailSubaddresses() {
-        return (Optional<Boolean>) blockEmailSubaddresses;
+        return blockEmailSubaddresses;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> ignoreDotsForGmailAddresses() {
-        return (Optional<Boolean>) ignoreDotsForGmailAddresses;
+        return ignoreDotsForGmailAddresses;
     }
 
     public final static Builder builder() {
@@ -127,7 +124,7 @@ public InstanceRestrictions withAllowlist(boolean allowlist) {
         return this;
     }
 
-    public InstanceRestrictions withAllowlist(Optional<? extends Boolean> allowlist) {
+    public InstanceRestrictions withAllowlist(Optional<Boolean> allowlist) {
         Utils.checkNotNull(allowlist, "allowlist");
         this.allowlist = allowlist;
         return this;
@@ -139,7 +136,7 @@ public InstanceRestrictions withBlocklist(boolean blocklist) {
         return this;
     }
 
-    public InstanceRestrictions withBlocklist(Optional<? extends Boolean> blocklist) {
+    public InstanceRestrictions withBlocklist(Optional<Boolean> blocklist) {
         Utils.checkNotNull(blocklist, "blocklist");
         this.blocklist = blocklist;
         return this;
@@ -151,7 +148,7 @@ public InstanceRestrictions withBlockEmailSubaddresses(boolean blockEmailSubaddr
         return this;
     }
 
-    public InstanceRestrictions withBlockEmailSubaddresses(Optional<? extends Boolean> blockEmailSubaddresses) {
+    public InstanceRestrictions withBlockEmailSubaddresses(Optional<Boolean> blockEmailSubaddresses) {
         Utils.checkNotNull(blockEmailSubaddresses, "blockEmailSubaddresses");
         this.blockEmailSubaddresses = blockEmailSubaddresses;
         return this;
@@ -163,7 +160,7 @@ public InstanceRestrictions withIgnoreDotsForGmailAddresses(boolean ignoreDotsFo
         return this;
     }
 
-    public InstanceRestrictions withIgnoreDotsForGmailAddresses(Optional<? extends Boolean> ignoreDotsForGmailAddresses) {
+    public InstanceRestrictions withIgnoreDotsForGmailAddresses(Optional<Boolean> ignoreDotsForGmailAddresses) {
         Utils.checkNotNull(ignoreDotsForGmailAddresses, "ignoreDotsForGmailAddresses");
         this.ignoreDotsForGmailAddresses = ignoreDotsForGmailAddresses;
         return this;
@@ -179,16 +176,16 @@ public boolean equals(java.lang.Object o) {
         }
         InstanceRestrictions other = (InstanceRestrictions) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.allowlist, other.allowlist) &&
-            java.util.Objects.deepEquals(this.blocklist, other.blocklist) &&
-            java.util.Objects.deepEquals(this.blockEmailSubaddresses, other.blockEmailSubaddresses) &&
-            java.util.Objects.deepEquals(this.ignoreDotsForGmailAddresses, other.ignoreDotsForGmailAddresses);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.allowlist, other.allowlist) &&
+            Objects.deepEquals(this.blocklist, other.blocklist) &&
+            Objects.deepEquals(this.blockEmailSubaddresses, other.blockEmailSubaddresses) &&
+            Objects.deepEquals(this.ignoreDotsForGmailAddresses, other.ignoreDotsForGmailAddresses);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             allowlist,
             blocklist,
@@ -210,13 +207,13 @@ public final static class Builder {
  
         private Optional<? extends InstanceRestrictionsObject> object = Optional.empty();
  
-        private Optional<? extends Boolean> allowlist = Optional.empty();
+        private Optional<Boolean> allowlist = Optional.empty();
  
-        private Optional<? extends Boolean> blocklist = Optional.empty();
+        private Optional<Boolean> blocklist = Optional.empty();
  
-        private Optional<? extends Boolean> blockEmailSubaddresses = Optional.empty();
+        private Optional<Boolean> blockEmailSubaddresses = Optional.empty();
  
-        private Optional<? extends Boolean> ignoreDotsForGmailAddresses = Optional.empty();  
+        private Optional<Boolean> ignoreDotsForGmailAddresses = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -246,7 +243,7 @@ public Builder allowlist(boolean allowlist) {
             return this;
         }
 
-        public Builder allowlist(Optional<? extends Boolean> allowlist) {
+        public Builder allowlist(Optional<Boolean> allowlist) {
             Utils.checkNotNull(allowlist, "allowlist");
             this.allowlist = allowlist;
             return this;
@@ -258,7 +255,7 @@ public Builder blocklist(boolean blocklist) {
             return this;
         }
 
-        public Builder blocklist(Optional<? extends Boolean> blocklist) {
+        public Builder blocklist(Optional<Boolean> blocklist) {
             Utils.checkNotNull(blocklist, "blocklist");
             this.blocklist = blocklist;
             return this;
@@ -270,7 +267,7 @@ public Builder blockEmailSubaddresses(boolean blockEmailSubaddresses) {
             return this;
         }
 
-        public Builder blockEmailSubaddresses(Optional<? extends Boolean> blockEmailSubaddresses) {
+        public Builder blockEmailSubaddresses(Optional<Boolean> blockEmailSubaddresses) {
             Utils.checkNotNull(blockEmailSubaddresses, "blockEmailSubaddresses");
             this.blockEmailSubaddresses = blockEmailSubaddresses;
             return this;
@@ -282,7 +279,7 @@ public Builder ignoreDotsForGmailAddresses(boolean ignoreDotsForGmailAddresses)
             return this;
         }
 
-        public Builder ignoreDotsForGmailAddresses(Optional<? extends Boolean> ignoreDotsForGmailAddresses) {
+        public Builder ignoreDotsForGmailAddresses(Optional<Boolean> ignoreDotsForGmailAddresses) {
             Utils.checkNotNull(ignoreDotsForGmailAddresses, "ignoreDotsForGmailAddresses");
             this.ignoreDotsForGmailAddresses = ignoreDotsForGmailAddresses;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/InstanceRestrictionsObject.java b/src/main/java/com/clerk/backend_api/models/components/InstanceRestrictionsObject.java
index 11913bb..087d7c9 100644
--- a/src/main/java/com/clerk/backend_api/models/components/InstanceRestrictionsObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/InstanceRestrictionsObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * InstanceRestrictionsObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/InstanceSettings.java b/src/main/java/com/clerk/backend_api/models/components/InstanceSettings.java
index 3823ef5..98d2423 100644
--- a/src/main/java/com/clerk/backend_api/models/components/InstanceSettings.java
+++ b/src/main/java/com/clerk/backend_api/models/components/InstanceSettings.java
@@ -4,20 +4,21 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class InstanceSettings {
 
     /**
@@ -29,32 +30,32 @@ public class InstanceSettings {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("id")
-    private Optional<? extends String> id;
+    private Optional<String> id;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("restricted_to_allowlist")
-    private Optional<? extends Boolean> restrictedToAllowlist;
+    private Optional<Boolean> restrictedToAllowlist;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("from_email_address")
-    private Optional<? extends String> fromEmailAddress;
+    private Optional<String> fromEmailAddress;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("progressive_sign_up")
-    private Optional<? extends Boolean> progressiveSignUp;
+    private Optional<Boolean> progressiveSignUp;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("enhanced_email_deliverability")
-    private Optional<? extends Boolean> enhancedEmailDeliverability;
+    private Optional<Boolean> enhancedEmailDeliverability;
 
     @JsonCreator
     public InstanceSettings(
             @JsonProperty("object") Optional<? extends InstanceSettingsObject> object,
-            @JsonProperty("id") Optional<? extends String> id,
-            @JsonProperty("restricted_to_allowlist") Optional<? extends Boolean> restrictedToAllowlist,
-            @JsonProperty("from_email_address") Optional<? extends String> fromEmailAddress,
-            @JsonProperty("progressive_sign_up") Optional<? extends Boolean> progressiveSignUp,
-            @JsonProperty("enhanced_email_deliverability") Optional<? extends Boolean> enhancedEmailDeliverability) {
+            @JsonProperty("id") Optional<String> id,
+            @JsonProperty("restricted_to_allowlist") Optional<Boolean> restrictedToAllowlist,
+            @JsonProperty("from_email_address") Optional<String> fromEmailAddress,
+            @JsonProperty("progressive_sign_up") Optional<Boolean> progressiveSignUp,
+            @JsonProperty("enhanced_email_deliverability") Optional<Boolean> enhancedEmailDeliverability) {
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(id, "id");
         Utils.checkNotNull(restrictedToAllowlist, "restrictedToAllowlist");
@@ -82,34 +83,29 @@ public Optional<InstanceSettingsObject> object() {
         return (Optional<InstanceSettingsObject>) object;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> id() {
-        return (Optional<String>) id;
+        return id;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> restrictedToAllowlist() {
-        return (Optional<Boolean>) restrictedToAllowlist;
+        return restrictedToAllowlist;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> fromEmailAddress() {
-        return (Optional<String>) fromEmailAddress;
+        return fromEmailAddress;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> progressiveSignUp() {
-        return (Optional<Boolean>) progressiveSignUp;
+        return progressiveSignUp;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> enhancedEmailDeliverability() {
-        return (Optional<Boolean>) enhancedEmailDeliverability;
+        return enhancedEmailDeliverability;
     }
 
     public final static Builder builder() {
@@ -140,7 +136,7 @@ public InstanceSettings withId(String id) {
         return this;
     }
 
-    public InstanceSettings withId(Optional<? extends String> id) {
+    public InstanceSettings withId(Optional<String> id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
@@ -152,7 +148,7 @@ public InstanceSettings withRestrictedToAllowlist(boolean restrictedToAllowlist)
         return this;
     }
 
-    public InstanceSettings withRestrictedToAllowlist(Optional<? extends Boolean> restrictedToAllowlist) {
+    public InstanceSettings withRestrictedToAllowlist(Optional<Boolean> restrictedToAllowlist) {
         Utils.checkNotNull(restrictedToAllowlist, "restrictedToAllowlist");
         this.restrictedToAllowlist = restrictedToAllowlist;
         return this;
@@ -164,7 +160,7 @@ public InstanceSettings withFromEmailAddress(String fromEmailAddress) {
         return this;
     }
 
-    public InstanceSettings withFromEmailAddress(Optional<? extends String> fromEmailAddress) {
+    public InstanceSettings withFromEmailAddress(Optional<String> fromEmailAddress) {
         Utils.checkNotNull(fromEmailAddress, "fromEmailAddress");
         this.fromEmailAddress = fromEmailAddress;
         return this;
@@ -176,7 +172,7 @@ public InstanceSettings withProgressiveSignUp(boolean progressiveSignUp) {
         return this;
     }
 
-    public InstanceSettings withProgressiveSignUp(Optional<? extends Boolean> progressiveSignUp) {
+    public InstanceSettings withProgressiveSignUp(Optional<Boolean> progressiveSignUp) {
         Utils.checkNotNull(progressiveSignUp, "progressiveSignUp");
         this.progressiveSignUp = progressiveSignUp;
         return this;
@@ -188,7 +184,7 @@ public InstanceSettings withEnhancedEmailDeliverability(boolean enhancedEmailDel
         return this;
     }
 
-    public InstanceSettings withEnhancedEmailDeliverability(Optional<? extends Boolean> enhancedEmailDeliverability) {
+    public InstanceSettings withEnhancedEmailDeliverability(Optional<Boolean> enhancedEmailDeliverability) {
         Utils.checkNotNull(enhancedEmailDeliverability, "enhancedEmailDeliverability");
         this.enhancedEmailDeliverability = enhancedEmailDeliverability;
         return this;
@@ -204,17 +200,17 @@ public boolean equals(java.lang.Object o) {
         }
         InstanceSettings other = (InstanceSettings) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.restrictedToAllowlist, other.restrictedToAllowlist) &&
-            java.util.Objects.deepEquals(this.fromEmailAddress, other.fromEmailAddress) &&
-            java.util.Objects.deepEquals(this.progressiveSignUp, other.progressiveSignUp) &&
-            java.util.Objects.deepEquals(this.enhancedEmailDeliverability, other.enhancedEmailDeliverability);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.restrictedToAllowlist, other.restrictedToAllowlist) &&
+            Objects.deepEquals(this.fromEmailAddress, other.fromEmailAddress) &&
+            Objects.deepEquals(this.progressiveSignUp, other.progressiveSignUp) &&
+            Objects.deepEquals(this.enhancedEmailDeliverability, other.enhancedEmailDeliverability);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             restrictedToAllowlist,
@@ -238,15 +234,15 @@ public final static class Builder {
  
         private Optional<? extends InstanceSettingsObject> object = Optional.empty();
  
-        private Optional<? extends String> id = Optional.empty();
+        private Optional<String> id = Optional.empty();
  
-        private Optional<? extends Boolean> restrictedToAllowlist = Optional.empty();
+        private Optional<Boolean> restrictedToAllowlist = Optional.empty();
  
-        private Optional<? extends String> fromEmailAddress = Optional.empty();
+        private Optional<String> fromEmailAddress = Optional.empty();
  
-        private Optional<? extends Boolean> progressiveSignUp = Optional.empty();
+        private Optional<Boolean> progressiveSignUp = Optional.empty();
  
-        private Optional<? extends Boolean> enhancedEmailDeliverability = Optional.empty();  
+        private Optional<Boolean> enhancedEmailDeliverability = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -276,7 +272,7 @@ public Builder id(String id) {
             return this;
         }
 
-        public Builder id(Optional<? extends String> id) {
+        public Builder id(Optional<String> id) {
             Utils.checkNotNull(id, "id");
             this.id = id;
             return this;
@@ -288,7 +284,7 @@ public Builder restrictedToAllowlist(boolean restrictedToAllowlist) {
             return this;
         }
 
-        public Builder restrictedToAllowlist(Optional<? extends Boolean> restrictedToAllowlist) {
+        public Builder restrictedToAllowlist(Optional<Boolean> restrictedToAllowlist) {
             Utils.checkNotNull(restrictedToAllowlist, "restrictedToAllowlist");
             this.restrictedToAllowlist = restrictedToAllowlist;
             return this;
@@ -300,7 +296,7 @@ public Builder fromEmailAddress(String fromEmailAddress) {
             return this;
         }
 
-        public Builder fromEmailAddress(Optional<? extends String> fromEmailAddress) {
+        public Builder fromEmailAddress(Optional<String> fromEmailAddress) {
             Utils.checkNotNull(fromEmailAddress, "fromEmailAddress");
             this.fromEmailAddress = fromEmailAddress;
             return this;
@@ -312,7 +308,7 @@ public Builder progressiveSignUp(boolean progressiveSignUp) {
             return this;
         }
 
-        public Builder progressiveSignUp(Optional<? extends Boolean> progressiveSignUp) {
+        public Builder progressiveSignUp(Optional<Boolean> progressiveSignUp) {
             Utils.checkNotNull(progressiveSignUp, "progressiveSignUp");
             this.progressiveSignUp = progressiveSignUp;
             return this;
@@ -324,7 +320,7 @@ public Builder enhancedEmailDeliverability(boolean enhancedEmailDeliverability)
             return this;
         }
 
-        public Builder enhancedEmailDeliverability(Optional<? extends Boolean> enhancedEmailDeliverability) {
+        public Builder enhancedEmailDeliverability(Optional<Boolean> enhancedEmailDeliverability) {
             Utils.checkNotNull(enhancedEmailDeliverability, "enhancedEmailDeliverability");
             this.enhancedEmailDeliverability = enhancedEmailDeliverability;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/InstanceSettingsObject.java b/src/main/java/com/clerk/backend_api/models/components/InstanceSettingsObject.java
index f6d95d1..b892a9b 100644
--- a/src/main/java/com/clerk/backend_api/models/components/InstanceSettingsObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/InstanceSettingsObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * InstanceSettingsObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/Invitation.java b/src/main/java/com/clerk/backend_api/models/components/Invitation.java
index 19786c8..cbadbe2 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Invitation.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Invitation.java
@@ -4,21 +4,23 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class Invitation {
 
     @JsonProperty("object")
@@ -36,14 +38,14 @@ public class Invitation {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("revoked")
-    private Optional<? extends Boolean> revoked;
+    private Optional<Boolean> revoked;
 
     @JsonProperty("status")
     private InvitationStatus status;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("url")
-    private JsonNullable<? extends String> url;
+    private JsonNullable<String> url;
 
     /**
      * Unix timestamp of creation.
@@ -65,9 +67,9 @@ public Invitation(
             @JsonProperty("id") String id,
             @JsonProperty("email_address") String emailAddress,
             @JsonProperty("public_metadata") Optional<? extends InvitationPublicMetadata> publicMetadata,
-            @JsonProperty("revoked") Optional<? extends Boolean> revoked,
+            @JsonProperty("revoked") Optional<Boolean> revoked,
             @JsonProperty("status") InvitationStatus status,
-            @JsonProperty("url") JsonNullable<? extends String> url,
+            @JsonProperty("url") JsonNullable<String> url,
             @JsonProperty("created_at") long createdAt,
             @JsonProperty("updated_at") long updatedAt) {
         Utils.checkNotNull(object, "object");
@@ -121,10 +123,9 @@ public Optional<InvitationPublicMetadata> publicMetadata() {
         return (Optional<InvitationPublicMetadata>) publicMetadata;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> revoked() {
-        return (Optional<Boolean>) revoked;
+        return revoked;
     }
 
     @JsonIgnore
@@ -132,10 +133,9 @@ public InvitationStatus status() {
         return status;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> url() {
-        return (JsonNullable<String>) url;
+        return url;
     }
 
     /**
@@ -196,7 +196,7 @@ public Invitation withRevoked(boolean revoked) {
         return this;
     }
 
-    public Invitation withRevoked(Optional<? extends Boolean> revoked) {
+    public Invitation withRevoked(Optional<Boolean> revoked) {
         Utils.checkNotNull(revoked, "revoked");
         this.revoked = revoked;
         return this;
@@ -214,7 +214,7 @@ public Invitation withUrl(String url) {
         return this;
     }
 
-    public Invitation withUrl(JsonNullable<? extends String> url) {
+    public Invitation withUrl(JsonNullable<String> url) {
         Utils.checkNotNull(url, "url");
         this.url = url;
         return this;
@@ -250,20 +250,20 @@ public boolean equals(java.lang.Object o) {
         }
         Invitation other = (Invitation) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.revoked, other.revoked) &&
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.url, other.url) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.revoked, other.revoked) &&
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.url, other.url) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             emailAddress,
@@ -299,11 +299,11 @@ public final static class Builder {
  
         private Optional<? extends InvitationPublicMetadata> publicMetadata = Optional.empty();
  
-        private Optional<? extends Boolean> revoked = Optional.empty();
+        private Optional<Boolean> revoked = Optional.empty();
  
         private InvitationStatus status;
  
-        private JsonNullable<? extends String> url = JsonNullable.undefined();
+        private JsonNullable<String> url = JsonNullable.undefined();
  
         private Long createdAt;
  
@@ -349,7 +349,7 @@ public Builder revoked(boolean revoked) {
             return this;
         }
 
-        public Builder revoked(Optional<? extends Boolean> revoked) {
+        public Builder revoked(Optional<Boolean> revoked) {
             Utils.checkNotNull(revoked, "revoked");
             this.revoked = revoked;
             return this;
@@ -367,7 +367,7 @@ public Builder url(String url) {
             return this;
         }
 
-        public Builder url(JsonNullable<? extends String> url) {
+        public Builder url(JsonNullable<String> url) {
             Utils.checkNotNull(url, "url");
             this.url = url;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/InvitationObject.java b/src/main/java/com/clerk/backend_api/models/components/InvitationObject.java
index 23b506f..63dffa1 100644
--- a/src/main/java/com/clerk/backend_api/models/components/InvitationObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/InvitationObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum InvitationObject {
     INVITATION("invitation");
diff --git a/src/main/java/com/clerk/backend_api/models/components/InvitationPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/components/InvitationPublicMetadata.java
index cdb4a4c..3457170 100644
--- a/src/main/java/com/clerk/backend_api/models/components/InvitationPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/InvitationPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class InvitationPublicMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/InvitationRevoked.java b/src/main/java/com/clerk/backend_api/models/components/InvitationRevoked.java
index 8b0d67e..cac9555 100644
--- a/src/main/java/com/clerk/backend_api/models/components/InvitationRevoked.java
+++ b/src/main/java/com/clerk/backend_api/models/components/InvitationRevoked.java
@@ -4,21 +4,23 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class InvitationRevoked {
 
     @JsonProperty("object")
@@ -36,14 +38,14 @@ public class InvitationRevoked {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("revoked")
-    private Optional<? extends Boolean> revoked;
+    private Optional<Boolean> revoked;
 
     @JsonProperty("status")
     private InvitationRevokedStatus status;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("url")
-    private JsonNullable<? extends String> url;
+    private JsonNullable<String> url;
 
     /**
      * Unix timestamp of creation.
@@ -65,9 +67,9 @@ public InvitationRevoked(
             @JsonProperty("id") String id,
             @JsonProperty("email_address") String emailAddress,
             @JsonProperty("public_metadata") Optional<? extends InvitationRevokedPublicMetadata> publicMetadata,
-            @JsonProperty("revoked") Optional<? extends Boolean> revoked,
+            @JsonProperty("revoked") Optional<Boolean> revoked,
             @JsonProperty("status") InvitationRevokedStatus status,
-            @JsonProperty("url") JsonNullable<? extends String> url,
+            @JsonProperty("url") JsonNullable<String> url,
             @JsonProperty("created_at") long createdAt,
             @JsonProperty("updated_at") long updatedAt) {
         Utils.checkNotNull(object, "object");
@@ -121,10 +123,9 @@ public Optional<InvitationRevokedPublicMetadata> publicMetadata() {
         return (Optional<InvitationRevokedPublicMetadata>) publicMetadata;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> revoked() {
-        return (Optional<Boolean>) revoked;
+        return revoked;
     }
 
     @JsonIgnore
@@ -132,10 +133,9 @@ public InvitationRevokedStatus status() {
         return status;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> url() {
-        return (JsonNullable<String>) url;
+        return url;
     }
 
     /**
@@ -196,7 +196,7 @@ public InvitationRevoked withRevoked(boolean revoked) {
         return this;
     }
 
-    public InvitationRevoked withRevoked(Optional<? extends Boolean> revoked) {
+    public InvitationRevoked withRevoked(Optional<Boolean> revoked) {
         Utils.checkNotNull(revoked, "revoked");
         this.revoked = revoked;
         return this;
@@ -214,7 +214,7 @@ public InvitationRevoked withUrl(String url) {
         return this;
     }
 
-    public InvitationRevoked withUrl(JsonNullable<? extends String> url) {
+    public InvitationRevoked withUrl(JsonNullable<String> url) {
         Utils.checkNotNull(url, "url");
         this.url = url;
         return this;
@@ -250,20 +250,20 @@ public boolean equals(java.lang.Object o) {
         }
         InvitationRevoked other = (InvitationRevoked) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.revoked, other.revoked) &&
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.url, other.url) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.revoked, other.revoked) &&
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.url, other.url) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             emailAddress,
@@ -299,11 +299,11 @@ public final static class Builder {
  
         private Optional<? extends InvitationRevokedPublicMetadata> publicMetadata = Optional.empty();
  
-        private Optional<? extends Boolean> revoked = Optional.empty();
+        private Optional<Boolean> revoked = Optional.empty();
  
         private InvitationRevokedStatus status;
  
-        private JsonNullable<? extends String> url = JsonNullable.undefined();
+        private JsonNullable<String> url = JsonNullable.undefined();
  
         private Long createdAt;
  
@@ -349,7 +349,7 @@ public Builder revoked(boolean revoked) {
             return this;
         }
 
-        public Builder revoked(Optional<? extends Boolean> revoked) {
+        public Builder revoked(Optional<Boolean> revoked) {
             Utils.checkNotNull(revoked, "revoked");
             this.revoked = revoked;
             return this;
@@ -367,7 +367,7 @@ public Builder url(String url) {
             return this;
         }
 
-        public Builder url(JsonNullable<? extends String> url) {
+        public Builder url(JsonNullable<String> url) {
             Utils.checkNotNull(url, "url");
             this.url = url;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/InvitationRevokedObject.java b/src/main/java/com/clerk/backend_api/models/components/InvitationRevokedObject.java
index aacadfc..f1f82a4 100644
--- a/src/main/java/com/clerk/backend_api/models/components/InvitationRevokedObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/InvitationRevokedObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum InvitationRevokedObject {
     INVITATION("invitation");
diff --git a/src/main/java/com/clerk/backend_api/models/components/InvitationRevokedPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/components/InvitationRevokedPublicMetadata.java
index 43ef77d..3a1f65b 100644
--- a/src/main/java/com/clerk/backend_api/models/components/InvitationRevokedPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/InvitationRevokedPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class InvitationRevokedPublicMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/InvitationRevokedStatus.java b/src/main/java/com/clerk/backend_api/models/components/InvitationRevokedStatus.java
index a80f4e0..5a8e073 100644
--- a/src/main/java/com/clerk/backend_api/models/components/InvitationRevokedStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/InvitationRevokedStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum InvitationRevokedStatus {
     REVOKED("revoked");
diff --git a/src/main/java/com/clerk/backend_api/models/components/InvitationStatus.java b/src/main/java/com/clerk/backend_api/models/components/InvitationStatus.java
index 71effa1..66d0078 100644
--- a/src/main/java/com/clerk/backend_api/models/components/InvitationStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/InvitationStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum InvitationStatus {
     PENDING("pending"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/JWTTemplate.java b/src/main/java/com/clerk/backend_api/models/components/JWTTemplate.java
index dd11e27..b0bb6b7 100644
--- a/src/main/java/com/clerk/backend_api/models/components/JWTTemplate.java
+++ b/src/main/java/com/clerk/backend_api/models/components/JWTTemplate.java
@@ -4,20 +4,21 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class JWTTemplate {
 
     @JsonProperty("object")
@@ -40,11 +41,11 @@ public class JWTTemplate {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("custom_signing_key")
-    private Optional<? extends Boolean> customSigningKey;
+    private Optional<Boolean> customSigningKey;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("signing_algorithm")
-    private Optional<? extends String> signingAlgorithm;
+    private Optional<String> signingAlgorithm;
 
     /**
      * Unix timestamp of creation.
@@ -68,8 +69,8 @@ public JWTTemplate(
             @JsonProperty("claims") Claims claims,
             @JsonProperty("lifetime") long lifetime,
             @JsonProperty("allowed_clock_skew") long allowedClockSkew,
-            @JsonProperty("custom_signing_key") Optional<? extends Boolean> customSigningKey,
-            @JsonProperty("signing_algorithm") Optional<? extends String> signingAlgorithm,
+            @JsonProperty("custom_signing_key") Optional<Boolean> customSigningKey,
+            @JsonProperty("signing_algorithm") Optional<String> signingAlgorithm,
             @JsonProperty("created_at") long createdAt,
             @JsonProperty("updated_at") long updatedAt) {
         Utils.checkNotNull(object, "object");
@@ -136,16 +137,14 @@ public long allowedClockSkew() {
         return allowedClockSkew;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> customSigningKey() {
-        return (Optional<Boolean>) customSigningKey;
+        return customSigningKey;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> signingAlgorithm() {
-        return (Optional<String>) signingAlgorithm;
+        return signingAlgorithm;
     }
 
     /**
@@ -212,7 +211,7 @@ public JWTTemplate withCustomSigningKey(boolean customSigningKey) {
         return this;
     }
 
-    public JWTTemplate withCustomSigningKey(Optional<? extends Boolean> customSigningKey) {
+    public JWTTemplate withCustomSigningKey(Optional<Boolean> customSigningKey) {
         Utils.checkNotNull(customSigningKey, "customSigningKey");
         this.customSigningKey = customSigningKey;
         return this;
@@ -224,7 +223,7 @@ public JWTTemplate withSigningAlgorithm(String signingAlgorithm) {
         return this;
     }
 
-    public JWTTemplate withSigningAlgorithm(Optional<? extends String> signingAlgorithm) {
+    public JWTTemplate withSigningAlgorithm(Optional<String> signingAlgorithm) {
         Utils.checkNotNull(signingAlgorithm, "signingAlgorithm");
         this.signingAlgorithm = signingAlgorithm;
         return this;
@@ -260,21 +259,21 @@ public boolean equals(java.lang.Object o) {
         }
         JWTTemplate other = (JWTTemplate) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.claims, other.claims) &&
-            java.util.Objects.deepEquals(this.lifetime, other.lifetime) &&
-            java.util.Objects.deepEquals(this.allowedClockSkew, other.allowedClockSkew) &&
-            java.util.Objects.deepEquals(this.customSigningKey, other.customSigningKey) &&
-            java.util.Objects.deepEquals(this.signingAlgorithm, other.signingAlgorithm) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.claims, other.claims) &&
+            Objects.deepEquals(this.lifetime, other.lifetime) &&
+            Objects.deepEquals(this.allowedClockSkew, other.allowedClockSkew) &&
+            Objects.deepEquals(this.customSigningKey, other.customSigningKey) &&
+            Objects.deepEquals(this.signingAlgorithm, other.signingAlgorithm) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             name,
@@ -316,9 +315,9 @@ public final static class Builder {
  
         private Long allowedClockSkew;
  
-        private Optional<? extends Boolean> customSigningKey = Optional.empty();
+        private Optional<Boolean> customSigningKey = Optional.empty();
  
-        private Optional<? extends String> signingAlgorithm = Optional.empty();
+        private Optional<String> signingAlgorithm = Optional.empty();
  
         private Long createdAt;
  
@@ -370,7 +369,7 @@ public Builder customSigningKey(boolean customSigningKey) {
             return this;
         }
 
-        public Builder customSigningKey(Optional<? extends Boolean> customSigningKey) {
+        public Builder customSigningKey(Optional<Boolean> customSigningKey) {
             Utils.checkNotNull(customSigningKey, "customSigningKey");
             this.customSigningKey = customSigningKey;
             return this;
@@ -382,7 +381,7 @@ public Builder signingAlgorithm(String signingAlgorithm) {
             return this;
         }
 
-        public Builder signingAlgorithm(Optional<? extends String> signingAlgorithm) {
+        public Builder signingAlgorithm(Optional<String> signingAlgorithm) {
             Utils.checkNotNull(signingAlgorithm, "signingAlgorithm");
             this.signingAlgorithm = signingAlgorithm;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/JWTTemplateObject.java b/src/main/java/com/clerk/backend_api/models/components/JWTTemplateObject.java
index 641e53a..fd512df 100644
--- a/src/main/java/com/clerk/backend_api/models/components/JWTTemplateObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/JWTTemplateObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum JWTTemplateObject {
     JWT_TEMPLATE("jwt_template");
diff --git a/src/main/java/com/clerk/backend_api/models/components/Meta.java b/src/main/java/com/clerk/backend_api/models/components/Meta.java
index abca4c9..32d7590 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Meta.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Meta.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class Meta {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/Nonce.java b/src/main/java/com/clerk/backend_api/models/components/Nonce.java
index 47dfc0c..b2e0b2a 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Nonce.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Nonce.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum Nonce {
     NONCE("nonce");
diff --git a/src/main/java/com/clerk/backend_api/models/components/OAuthApplication.java b/src/main/java/com/clerk/backend_api/models/components/OAuthApplication.java
index d79ad69..033b98a 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OAuthApplication.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OAuthApplication.java
@@ -4,16 +4,17 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class OAuthApplication {
 
@@ -280,24 +281,24 @@ public boolean equals(java.lang.Object o) {
         }
         OAuthApplication other = (OAuthApplication) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.instanceId, other.instanceId) &&
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.clientId, other.clientId) &&
-            java.util.Objects.deepEquals(this.public_, other.public_) &&
-            java.util.Objects.deepEquals(this.scopes, other.scopes) &&
-            java.util.Objects.deepEquals(this.callbackUrl, other.callbackUrl) &&
-            java.util.Objects.deepEquals(this.authorizeUrl, other.authorizeUrl) &&
-            java.util.Objects.deepEquals(this.tokenFetchUrl, other.tokenFetchUrl) &&
-            java.util.Objects.deepEquals(this.userInfoUrl, other.userInfoUrl) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.instanceId, other.instanceId) &&
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.clientId, other.clientId) &&
+            Objects.deepEquals(this.public_, other.public_) &&
+            Objects.deepEquals(this.scopes, other.scopes) &&
+            Objects.deepEquals(this.callbackUrl, other.callbackUrl) &&
+            Objects.deepEquals(this.authorizeUrl, other.authorizeUrl) &&
+            Objects.deepEquals(this.tokenFetchUrl, other.tokenFetchUrl) &&
+            Objects.deepEquals(this.userInfoUrl, other.userInfoUrl) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             instanceId,
diff --git a/src/main/java/com/clerk/backend_api/models/components/OAuthApplicationObject.java b/src/main/java/com/clerk/backend_api/models/components/OAuthApplicationObject.java
index 53a8e94..05e47a4 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OAuthApplicationObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OAuthApplicationObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum OAuthApplicationObject {
     OAUTH_APPLICATION("oauth_application");
diff --git a/src/main/java/com/clerk/backend_api/models/components/OAuthApplicationWithSecret.java b/src/main/java/com/clerk/backend_api/models/components/OAuthApplicationWithSecret.java
index 7e99cec..47dce3e 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OAuthApplicationWithSecret.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OAuthApplicationWithSecret.java
@@ -4,20 +4,21 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class OAuthApplicationWithSecret {
 
     @JsonProperty("object")
@@ -73,7 +74,7 @@ public class OAuthApplicationWithSecret {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("client_secret")
-    private Optional<? extends String> clientSecret;
+    private Optional<String> clientSecret;
 
     @JsonCreator
     public OAuthApplicationWithSecret(
@@ -90,7 +91,7 @@ public OAuthApplicationWithSecret(
             @JsonProperty("user_info_url") String userInfoUrl,
             @JsonProperty("created_at") long createdAt,
             @JsonProperty("updated_at") long updatedAt,
-            @JsonProperty("client_secret") Optional<? extends String> clientSecret) {
+            @JsonProperty("client_secret") Optional<String> clientSecret) {
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(id, "id");
         Utils.checkNotNull(instanceId, "instanceId");
@@ -215,10 +216,9 @@ public long updatedAt() {
      * Empty if public client.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> clientSecret() {
-        return (Optional<String>) clientSecret;
+        return clientSecret;
     }
 
     public final static Builder builder() {
@@ -325,7 +325,7 @@ public OAuthApplicationWithSecret withClientSecret(String clientSecret) {
      * Empty if public client.
      * 
      */
-    public OAuthApplicationWithSecret withClientSecret(Optional<? extends String> clientSecret) {
+    public OAuthApplicationWithSecret withClientSecret(Optional<String> clientSecret) {
         Utils.checkNotNull(clientSecret, "clientSecret");
         this.clientSecret = clientSecret;
         return this;
@@ -341,25 +341,25 @@ public boolean equals(java.lang.Object o) {
         }
         OAuthApplicationWithSecret other = (OAuthApplicationWithSecret) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.instanceId, other.instanceId) &&
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.clientId, other.clientId) &&
-            java.util.Objects.deepEquals(this.public_, other.public_) &&
-            java.util.Objects.deepEquals(this.scopes, other.scopes) &&
-            java.util.Objects.deepEquals(this.callbackUrl, other.callbackUrl) &&
-            java.util.Objects.deepEquals(this.authorizeUrl, other.authorizeUrl) &&
-            java.util.Objects.deepEquals(this.tokenFetchUrl, other.tokenFetchUrl) &&
-            java.util.Objects.deepEquals(this.userInfoUrl, other.userInfoUrl) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt) &&
-            java.util.Objects.deepEquals(this.clientSecret, other.clientSecret);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.instanceId, other.instanceId) &&
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.clientId, other.clientId) &&
+            Objects.deepEquals(this.public_, other.public_) &&
+            Objects.deepEquals(this.scopes, other.scopes) &&
+            Objects.deepEquals(this.callbackUrl, other.callbackUrl) &&
+            Objects.deepEquals(this.authorizeUrl, other.authorizeUrl) &&
+            Objects.deepEquals(this.tokenFetchUrl, other.tokenFetchUrl) &&
+            Objects.deepEquals(this.userInfoUrl, other.userInfoUrl) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt) &&
+            Objects.deepEquals(this.clientSecret, other.clientSecret);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             instanceId,
@@ -423,7 +423,7 @@ public final static class Builder {
  
         private Long updatedAt;
  
-        private Optional<? extends String> clientSecret = Optional.empty();  
+        private Optional<String> clientSecret = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -529,7 +529,7 @@ public Builder clientSecret(String clientSecret) {
          * Empty if public client.
          * 
          */
-        public Builder clientSecret(Optional<? extends String> clientSecret) {
+        public Builder clientSecret(Optional<String> clientSecret) {
             Utils.checkNotNull(clientSecret, "clientSecret");
             this.clientSecret = clientSecret;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/OAuthApplicationWithSecretObject.java b/src/main/java/com/clerk/backend_api/models/components/OAuthApplicationWithSecretObject.java
index 6ac4a61..a18d53b 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OAuthApplicationWithSecretObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OAuthApplicationWithSecretObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum OAuthApplicationWithSecretObject {
     OAUTH_APPLICATION("oauth_application");
diff --git a/src/main/java/com/clerk/backend_api/models/components/OAuthApplications.java b/src/main/java/com/clerk/backend_api/models/components/OAuthApplications.java
index 2dbace9..c9adb69 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OAuthApplications.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OAuthApplications.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+
 
 public class OAuthApplications {
 
     @JsonProperty("data")
-    private java.util.List<OAuthApplication> data;
+    private List<OAuthApplication> data;
 
     /**
      * Total number of OAuth applications
@@ -29,7 +30,7 @@ public class OAuthApplications {
 
     @JsonCreator
     public OAuthApplications(
-            @JsonProperty("data") java.util.List<OAuthApplication> data,
+            @JsonProperty("data") List<OAuthApplication> data,
             @JsonProperty("total_count") long totalCount) {
         Utils.checkNotNull(data, "data");
         Utils.checkNotNull(totalCount, "totalCount");
@@ -38,7 +39,7 @@ public OAuthApplications(
     }
 
     @JsonIgnore
-    public java.util.List<OAuthApplication> data() {
+    public List<OAuthApplication> data() {
         return data;
     }
 
@@ -55,7 +56,7 @@ public final static Builder builder() {
         return new Builder();
     }
 
-    public OAuthApplications withData(java.util.List<OAuthApplication> data) {
+    public OAuthApplications withData(List<OAuthApplication> data) {
         Utils.checkNotNull(data, "data");
         this.data = data;
         return this;
@@ -81,13 +82,13 @@ public boolean equals(java.lang.Object o) {
         }
         OAuthApplications other = (OAuthApplications) o;
         return 
-            java.util.Objects.deepEquals(this.data, other.data) &&
-            java.util.Objects.deepEquals(this.totalCount, other.totalCount);
+            Objects.deepEquals(this.data, other.data) &&
+            Objects.deepEquals(this.totalCount, other.totalCount);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             data,
             totalCount);
     }
@@ -101,7 +102,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private java.util.List<OAuthApplication> data;
+        private List<OAuthApplication> data;
  
         private Long totalCount;  
         
@@ -109,7 +110,7 @@ private Builder() {
           // force use of static builder() method
         }
 
-        public Builder data(java.util.List<OAuthApplication> data) {
+        public Builder data(List<OAuthApplication> data) {
             Utils.checkNotNull(data, "data");
             this.data = data;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/OTPVerificationStatus.java b/src/main/java/com/clerk/backend_api/models/components/OTPVerificationStatus.java
index 51577b3..c8d8505 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OTPVerificationStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OTPVerificationStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum OTPVerificationStatus {
     UNVERIFIED("unverified"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/OTPVerificationStrategy.java b/src/main/java/com/clerk/backend_api/models/components/OTPVerificationStrategy.java
index dfc3689..11232b5 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OTPVerificationStrategy.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OTPVerificationStrategy.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum OTPVerificationStrategy {
     PHONE_CODE("phone_code"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/Oauth.java b/src/main/java/com/clerk/backend_api/models/components/Oauth.java
index a0ffb64..4fa67d4 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Oauth.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Oauth.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class Oauth {
 
     @JsonProperty("status")
@@ -29,7 +30,7 @@ public class Oauth {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("external_verification_redirect_url")
-    private Optional<? extends String> externalVerificationRedirectUrl;
+    private Optional<String> externalVerificationRedirectUrl;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("error")
@@ -40,16 +41,16 @@ public class Oauth {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("attempts")
-    private JsonNullable<? extends Long> attempts;
+    private JsonNullable<Long> attempts;
 
     @JsonCreator
     public Oauth(
             @JsonProperty("status") OauthVerificationStatus status,
             @JsonProperty("strategy") OauthVerificationStrategy strategy,
-            @JsonProperty("external_verification_redirect_url") Optional<? extends String> externalVerificationRedirectUrl,
+            @JsonProperty("external_verification_redirect_url") Optional<String> externalVerificationRedirectUrl,
             @JsonProperty("error") JsonNullable<? extends Error> error,
             @JsonProperty("expire_at") long expireAt,
-            @JsonProperty("attempts") JsonNullable<? extends Long> attempts) {
+            @JsonProperty("attempts") JsonNullable<Long> attempts) {
         Utils.checkNotNull(status, "status");
         Utils.checkNotNull(strategy, "strategy");
         Utils.checkNotNull(externalVerificationRedirectUrl, "externalVerificationRedirectUrl");
@@ -81,10 +82,9 @@ public OauthVerificationStrategy strategy() {
         return strategy;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> externalVerificationRedirectUrl() {
-        return (Optional<String>) externalVerificationRedirectUrl;
+        return externalVerificationRedirectUrl;
     }
 
     @SuppressWarnings("unchecked")
@@ -98,10 +98,9 @@ public long expireAt() {
         return expireAt;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> attempts() {
-        return (JsonNullable<Long>) attempts;
+        return attempts;
     }
 
     public final static Builder builder() {
@@ -126,7 +125,7 @@ public Oauth withExternalVerificationRedirectUrl(String externalVerificationRedi
         return this;
     }
 
-    public Oauth withExternalVerificationRedirectUrl(Optional<? extends String> externalVerificationRedirectUrl) {
+    public Oauth withExternalVerificationRedirectUrl(Optional<String> externalVerificationRedirectUrl) {
         Utils.checkNotNull(externalVerificationRedirectUrl, "externalVerificationRedirectUrl");
         this.externalVerificationRedirectUrl = externalVerificationRedirectUrl;
         return this;
@@ -156,7 +155,7 @@ public Oauth withAttempts(long attempts) {
         return this;
     }
 
-    public Oauth withAttempts(JsonNullable<? extends Long> attempts) {
+    public Oauth withAttempts(JsonNullable<Long> attempts) {
         Utils.checkNotNull(attempts, "attempts");
         this.attempts = attempts;
         return this;
@@ -172,17 +171,17 @@ public boolean equals(java.lang.Object o) {
         }
         Oauth other = (Oauth) o;
         return 
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.strategy, other.strategy) &&
-            java.util.Objects.deepEquals(this.externalVerificationRedirectUrl, other.externalVerificationRedirectUrl) &&
-            java.util.Objects.deepEquals(this.error, other.error) &&
-            java.util.Objects.deepEquals(this.expireAt, other.expireAt) &&
-            java.util.Objects.deepEquals(this.attempts, other.attempts);
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.strategy, other.strategy) &&
+            Objects.deepEquals(this.externalVerificationRedirectUrl, other.externalVerificationRedirectUrl) &&
+            Objects.deepEquals(this.error, other.error) &&
+            Objects.deepEquals(this.expireAt, other.expireAt) &&
+            Objects.deepEquals(this.attempts, other.attempts);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             status,
             strategy,
             externalVerificationRedirectUrl,
@@ -208,13 +207,13 @@ public final static class Builder {
  
         private OauthVerificationStrategy strategy;
  
-        private Optional<? extends String> externalVerificationRedirectUrl = Optional.empty();
+        private Optional<String> externalVerificationRedirectUrl = Optional.empty();
  
         private JsonNullable<? extends Error> error = JsonNullable.undefined();
  
         private Long expireAt;
  
-        private JsonNullable<? extends Long> attempts = JsonNullable.undefined();  
+        private JsonNullable<Long> attempts = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -238,7 +237,7 @@ public Builder externalVerificationRedirectUrl(String externalVerificationRedire
             return this;
         }
 
-        public Builder externalVerificationRedirectUrl(Optional<? extends String> externalVerificationRedirectUrl) {
+        public Builder externalVerificationRedirectUrl(Optional<String> externalVerificationRedirectUrl) {
             Utils.checkNotNull(externalVerificationRedirectUrl, "externalVerificationRedirectUrl");
             this.externalVerificationRedirectUrl = externalVerificationRedirectUrl;
             return this;
@@ -268,7 +267,7 @@ public Builder attempts(long attempts) {
             return this;
         }
 
-        public Builder attempts(JsonNullable<? extends Long> attempts) {
+        public Builder attempts(JsonNullable<Long> attempts) {
             Utils.checkNotNull(attempts, "attempts");
             this.attempts = attempts;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/OauthVerificationStatus.java b/src/main/java/com/clerk/backend_api/models/components/OauthVerificationStatus.java
index d2fa004..2c29e80 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OauthVerificationStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OauthVerificationStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum OauthVerificationStatus {
     UNVERIFIED("unverified"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/OauthVerificationStrategy.java b/src/main/java/com/clerk/backend_api/models/components/OauthVerificationStrategy.java
index 316481b..d665f93 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OauthVerificationStrategy.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OauthVerificationStrategy.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum OauthVerificationStrategy {
     OAUTH_GOOGLE("oauth_google"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/Object.java b/src/main/java/com/clerk/backend_api/models/components/Object.java
index 14c82a3..0e45561 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Object.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Object.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * Object - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/Organization.java b/src/main/java/com/clerk/backend_api/models/components/Organization.java
index de0a89a..82bdbd0 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Organization.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Organization.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class Organization {
 
     @JsonProperty("object")
@@ -35,14 +36,14 @@ public class Organization {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("members_count")
-    private JsonNullable<? extends Long> membersCount;
+    private JsonNullable<Long> membersCount;
 
     @JsonProperty("max_allowed_memberships")
     private long maxAllowedMemberships;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("admin_delete_enabled")
-    private Optional<? extends Boolean> adminDeleteEnabled;
+    private Optional<Boolean> adminDeleteEnabled;
 
     @JsonProperty("public_metadata")
     private OrganizationPublicMetadata publicMetadata;
@@ -52,7 +53,7 @@ public class Organization {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("created_by")
-    private Optional<? extends String> createdBy;
+    private Optional<String> createdBy;
 
     /**
      * Unix timestamp of creation.
@@ -74,12 +75,12 @@ public Organization(
             @JsonProperty("id") String id,
             @JsonProperty("name") String name,
             @JsonProperty("slug") String slug,
-            @JsonProperty("members_count") JsonNullable<? extends Long> membersCount,
+            @JsonProperty("members_count") JsonNullable<Long> membersCount,
             @JsonProperty("max_allowed_memberships") long maxAllowedMemberships,
-            @JsonProperty("admin_delete_enabled") Optional<? extends Boolean> adminDeleteEnabled,
+            @JsonProperty("admin_delete_enabled") Optional<Boolean> adminDeleteEnabled,
             @JsonProperty("public_metadata") OrganizationPublicMetadata publicMetadata,
             @JsonProperty("private_metadata") OrganizationPrivateMetadata privateMetadata,
-            @JsonProperty("created_by") Optional<? extends String> createdBy,
+            @JsonProperty("created_by") Optional<String> createdBy,
             @JsonProperty("created_at") long createdAt,
             @JsonProperty("updated_at") long updatedAt) {
         Utils.checkNotNull(object, "object");
@@ -141,10 +142,9 @@ public String slug() {
         return slug;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> membersCount() {
-        return (JsonNullable<Long>) membersCount;
+        return membersCount;
     }
 
     @JsonIgnore
@@ -152,10 +152,9 @@ public long maxAllowedMemberships() {
         return maxAllowedMemberships;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> adminDeleteEnabled() {
-        return (Optional<Boolean>) adminDeleteEnabled;
+        return adminDeleteEnabled;
     }
 
     @JsonIgnore
@@ -168,10 +167,9 @@ public OrganizationPrivateMetadata privateMetadata() {
         return privateMetadata;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> createdBy() {
-        return (Optional<String>) createdBy;
+        return createdBy;
     }
 
     /**
@@ -226,7 +224,7 @@ public Organization withMembersCount(long membersCount) {
         return this;
     }
 
-    public Organization withMembersCount(JsonNullable<? extends Long> membersCount) {
+    public Organization withMembersCount(JsonNullable<Long> membersCount) {
         Utils.checkNotNull(membersCount, "membersCount");
         this.membersCount = membersCount;
         return this;
@@ -244,7 +242,7 @@ public Organization withAdminDeleteEnabled(boolean adminDeleteEnabled) {
         return this;
     }
 
-    public Organization withAdminDeleteEnabled(Optional<? extends Boolean> adminDeleteEnabled) {
+    public Organization withAdminDeleteEnabled(Optional<Boolean> adminDeleteEnabled) {
         Utils.checkNotNull(adminDeleteEnabled, "adminDeleteEnabled");
         this.adminDeleteEnabled = adminDeleteEnabled;
         return this;
@@ -268,7 +266,7 @@ public Organization withCreatedBy(String createdBy) {
         return this;
     }
 
-    public Organization withCreatedBy(Optional<? extends String> createdBy) {
+    public Organization withCreatedBy(Optional<String> createdBy) {
         Utils.checkNotNull(createdBy, "createdBy");
         this.createdBy = createdBy;
         return this;
@@ -304,23 +302,23 @@ public boolean equals(java.lang.Object o) {
         }
         Organization other = (Organization) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.slug, other.slug) &&
-            java.util.Objects.deepEquals(this.membersCount, other.membersCount) &&
-            java.util.Objects.deepEquals(this.maxAllowedMemberships, other.maxAllowedMemberships) &&
-            java.util.Objects.deepEquals(this.adminDeleteEnabled, other.adminDeleteEnabled) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
-            java.util.Objects.deepEquals(this.createdBy, other.createdBy) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.slug, other.slug) &&
+            Objects.deepEquals(this.membersCount, other.membersCount) &&
+            Objects.deepEquals(this.maxAllowedMemberships, other.maxAllowedMemberships) &&
+            Objects.deepEquals(this.adminDeleteEnabled, other.adminDeleteEnabled) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
+            Objects.deepEquals(this.createdBy, other.createdBy) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             name,
@@ -362,17 +360,17 @@ public final static class Builder {
  
         private String slug;
  
-        private JsonNullable<? extends Long> membersCount = JsonNullable.undefined();
+        private JsonNullable<Long> membersCount = JsonNullable.undefined();
  
         private Long maxAllowedMemberships;
  
-        private Optional<? extends Boolean> adminDeleteEnabled = Optional.empty();
+        private Optional<Boolean> adminDeleteEnabled = Optional.empty();
  
         private OrganizationPublicMetadata publicMetadata;
  
         private OrganizationPrivateMetadata privateMetadata;
  
-        private Optional<? extends String> createdBy = Optional.empty();
+        private Optional<String> createdBy = Optional.empty();
  
         private Long createdAt;
  
@@ -412,7 +410,7 @@ public Builder membersCount(long membersCount) {
             return this;
         }
 
-        public Builder membersCount(JsonNullable<? extends Long> membersCount) {
+        public Builder membersCount(JsonNullable<Long> membersCount) {
             Utils.checkNotNull(membersCount, "membersCount");
             this.membersCount = membersCount;
             return this;
@@ -430,7 +428,7 @@ public Builder adminDeleteEnabled(boolean adminDeleteEnabled) {
             return this;
         }
 
-        public Builder adminDeleteEnabled(Optional<? extends Boolean> adminDeleteEnabled) {
+        public Builder adminDeleteEnabled(Optional<Boolean> adminDeleteEnabled) {
             Utils.checkNotNull(adminDeleteEnabled, "adminDeleteEnabled");
             this.adminDeleteEnabled = adminDeleteEnabled;
             return this;
@@ -454,7 +452,7 @@ public Builder createdBy(String createdBy) {
             return this;
         }
 
-        public Builder createdBy(Optional<? extends String> createdBy) {
+        public Builder createdBy(Optional<String> createdBy) {
             Utils.checkNotNull(createdBy, "createdBy");
             this.createdBy = createdBy;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitation.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitation.java
index 8d07a6d..4fd5cd0 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitation.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitation.java
@@ -4,19 +4,20 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
+
 /**
  * OrganizationInvitation - An organization invitation
  */
@@ -25,7 +26,7 @@ public class OrganizationInvitation {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("id")
-    private Optional<? extends String> id;
+    private Optional<String> id;
 
     /**
      * String representing the object's type. Objects of the same type share the same value.
@@ -37,19 +38,19 @@ public class OrganizationInvitation {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("email_address")
-    private Optional<? extends String> emailAddress;
+    private Optional<String> emailAddress;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("role")
-    private Optional<? extends String> role;
+    private Optional<String> role;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("organization_id")
-    private Optional<? extends String> organizationId;
+    private Optional<String> organizationId;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("status")
-    private Optional<? extends String> status;
+    private Optional<String> status;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("public_metadata")
@@ -64,27 +65,27 @@ public class OrganizationInvitation {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("created_at")
-    private Optional<? extends Long> createdAt;
+    private Optional<Long> createdAt;
 
     /**
      * Unix timestamp of last update.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("updated_at")
-    private Optional<? extends Long> updatedAt;
+    private Optional<Long> updatedAt;
 
     @JsonCreator
     public OrganizationInvitation(
-            @JsonProperty("id") Optional<? extends String> id,
+            @JsonProperty("id") Optional<String> id,
             @JsonProperty("object") Optional<? extends OrganizationInvitationObject> object,
-            @JsonProperty("email_address") Optional<? extends String> emailAddress,
-            @JsonProperty("role") Optional<? extends String> role,
-            @JsonProperty("organization_id") Optional<? extends String> organizationId,
-            @JsonProperty("status") Optional<? extends String> status,
+            @JsonProperty("email_address") Optional<String> emailAddress,
+            @JsonProperty("role") Optional<String> role,
+            @JsonProperty("organization_id") Optional<String> organizationId,
+            @JsonProperty("status") Optional<String> status,
             @JsonProperty("public_metadata") Optional<? extends OrganizationInvitationPublicMetadata> publicMetadata,
             @JsonProperty("private_metadata") Optional<? extends OrganizationInvitationPrivateMetadata> privateMetadata,
-            @JsonProperty("created_at") Optional<? extends Long> createdAt,
-            @JsonProperty("updated_at") Optional<? extends Long> updatedAt) {
+            @JsonProperty("created_at") Optional<Long> createdAt,
+            @JsonProperty("updated_at") Optional<Long> updatedAt) {
         Utils.checkNotNull(id, "id");
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(emailAddress, "emailAddress");
@@ -111,10 +112,9 @@ public OrganizationInvitation() {
         this(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> id() {
-        return (Optional<String>) id;
+        return id;
     }
 
     /**
@@ -127,28 +127,24 @@ public Optional<OrganizationInvitationObject> object() {
         return (Optional<OrganizationInvitationObject>) object;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> emailAddress() {
-        return (Optional<String>) emailAddress;
+        return emailAddress;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> role() {
-        return (Optional<String>) role;
+        return role;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> organizationId() {
-        return (Optional<String>) organizationId;
+        return organizationId;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> status() {
-        return (Optional<String>) status;
+        return status;
     }
 
     @SuppressWarnings("unchecked")
@@ -166,19 +162,17 @@ public Optional<OrganizationInvitationPrivateMetadata> privateMetadata() {
     /**
      * Unix timestamp of creation.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> createdAt() {
-        return (Optional<Long>) createdAt;
+        return createdAt;
     }
 
     /**
      * Unix timestamp of last update.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> updatedAt() {
-        return (Optional<Long>) updatedAt;
+        return updatedAt;
     }
 
     public final static Builder builder() {
@@ -191,7 +185,7 @@ public OrganizationInvitation withId(String id) {
         return this;
     }
 
-    public OrganizationInvitation withId(Optional<? extends String> id) {
+    public OrganizationInvitation withId(Optional<String> id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
@@ -223,7 +217,7 @@ public OrganizationInvitation withEmailAddress(String emailAddress) {
         return this;
     }
 
-    public OrganizationInvitation withEmailAddress(Optional<? extends String> emailAddress) {
+    public OrganizationInvitation withEmailAddress(Optional<String> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = emailAddress;
         return this;
@@ -235,7 +229,7 @@ public OrganizationInvitation withRole(String role) {
         return this;
     }
 
-    public OrganizationInvitation withRole(Optional<? extends String> role) {
+    public OrganizationInvitation withRole(Optional<String> role) {
         Utils.checkNotNull(role, "role");
         this.role = role;
         return this;
@@ -247,7 +241,7 @@ public OrganizationInvitation withOrganizationId(String organizationId) {
         return this;
     }
 
-    public OrganizationInvitation withOrganizationId(Optional<? extends String> organizationId) {
+    public OrganizationInvitation withOrganizationId(Optional<String> organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
@@ -259,7 +253,7 @@ public OrganizationInvitation withStatus(String status) {
         return this;
     }
 
-    public OrganizationInvitation withStatus(Optional<? extends String> status) {
+    public OrganizationInvitation withStatus(Optional<String> status) {
         Utils.checkNotNull(status, "status");
         this.status = status;
         return this;
@@ -301,7 +295,7 @@ public OrganizationInvitation withCreatedAt(long createdAt) {
     /**
      * Unix timestamp of creation.
      */
-    public OrganizationInvitation withCreatedAt(Optional<? extends Long> createdAt) {
+    public OrganizationInvitation withCreatedAt(Optional<Long> createdAt) {
         Utils.checkNotNull(createdAt, "createdAt");
         this.createdAt = createdAt;
         return this;
@@ -319,7 +313,7 @@ public OrganizationInvitation withUpdatedAt(long updatedAt) {
     /**
      * Unix timestamp of last update.
      */
-    public OrganizationInvitation withUpdatedAt(Optional<? extends Long> updatedAt) {
+    public OrganizationInvitation withUpdatedAt(Optional<Long> updatedAt) {
         Utils.checkNotNull(updatedAt, "updatedAt");
         this.updatedAt = updatedAt;
         return this;
@@ -335,21 +329,21 @@ public boolean equals(java.lang.Object o) {
         }
         OrganizationInvitation other = (OrganizationInvitation) o;
         return 
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.role, other.role) &&
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.role, other.role) &&
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             id,
             object,
             emailAddress,
@@ -379,25 +373,25 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> id = Optional.empty();
+        private Optional<String> id = Optional.empty();
  
         private Optional<? extends OrganizationInvitationObject> object = Optional.empty();
  
-        private Optional<? extends String> emailAddress = Optional.empty();
+        private Optional<String> emailAddress = Optional.empty();
  
-        private Optional<? extends String> role = Optional.empty();
+        private Optional<String> role = Optional.empty();
  
-        private Optional<? extends String> organizationId = Optional.empty();
+        private Optional<String> organizationId = Optional.empty();
  
-        private Optional<? extends String> status = Optional.empty();
+        private Optional<String> status = Optional.empty();
  
         private Optional<? extends OrganizationInvitationPublicMetadata> publicMetadata = Optional.empty();
  
         private Optional<? extends OrganizationInvitationPrivateMetadata> privateMetadata = Optional.empty();
  
-        private Optional<? extends Long> createdAt = Optional.empty();
+        private Optional<Long> createdAt = Optional.empty();
  
-        private Optional<? extends Long> updatedAt = Optional.empty();  
+        private Optional<Long> updatedAt = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -409,7 +403,7 @@ public Builder id(String id) {
             return this;
         }
 
-        public Builder id(Optional<? extends String> id) {
+        public Builder id(Optional<String> id) {
             Utils.checkNotNull(id, "id");
             this.id = id;
             return this;
@@ -441,7 +435,7 @@ public Builder emailAddress(String emailAddress) {
             return this;
         }
 
-        public Builder emailAddress(Optional<? extends String> emailAddress) {
+        public Builder emailAddress(Optional<String> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = emailAddress;
             return this;
@@ -453,7 +447,7 @@ public Builder role(String role) {
             return this;
         }
 
-        public Builder role(Optional<? extends String> role) {
+        public Builder role(Optional<String> role) {
             Utils.checkNotNull(role, "role");
             this.role = role;
             return this;
@@ -465,7 +459,7 @@ public Builder organizationId(String organizationId) {
             return this;
         }
 
-        public Builder organizationId(Optional<? extends String> organizationId) {
+        public Builder organizationId(Optional<String> organizationId) {
             Utils.checkNotNull(organizationId, "organizationId");
             this.organizationId = organizationId;
             return this;
@@ -477,7 +471,7 @@ public Builder status(String status) {
             return this;
         }
 
-        public Builder status(Optional<? extends String> status) {
+        public Builder status(Optional<String> status) {
             Utils.checkNotNull(status, "status");
             this.status = status;
             return this;
@@ -519,7 +513,7 @@ public Builder createdAt(long createdAt) {
         /**
          * Unix timestamp of creation.
          */
-        public Builder createdAt(Optional<? extends Long> createdAt) {
+        public Builder createdAt(Optional<Long> createdAt) {
             Utils.checkNotNull(createdAt, "createdAt");
             this.createdAt = createdAt;
             return this;
@@ -537,7 +531,7 @@ public Builder updatedAt(long updatedAt) {
         /**
          * Unix timestamp of last update.
          */
-        public Builder updatedAt(Optional<? extends Long> updatedAt) {
+        public Builder updatedAt(Optional<Long> updatedAt) {
             Utils.checkNotNull(updatedAt, "updatedAt");
             this.updatedAt = updatedAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitationObject.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitationObject.java
index 47effff..b6fa77b 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitationObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitationObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * OrganizationInvitationObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitationPrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitationPrivateMetadata.java
index 2d942e6..a7f4479 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitationPrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitationPrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class OrganizationInvitationPrivateMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitationPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitationPublicMetadata.java
index c2ec2ee..42dfe9a 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitationPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitationPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class OrganizationInvitationPublicMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitations.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitations.java
index dd76259..678960b 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitations.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationInvitations.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+
 
 public class OrganizationInvitations {
 
     @JsonProperty("data")
-    private java.util.List<OrganizationInvitation> data;
+    private List<OrganizationInvitation> data;
 
     /**
      * Total number of organization invitations
@@ -29,7 +30,7 @@ public class OrganizationInvitations {
 
     @JsonCreator
     public OrganizationInvitations(
-            @JsonProperty("data") java.util.List<OrganizationInvitation> data,
+            @JsonProperty("data") List<OrganizationInvitation> data,
             @JsonProperty("total_count") long totalCount) {
         Utils.checkNotNull(data, "data");
         Utils.checkNotNull(totalCount, "totalCount");
@@ -38,7 +39,7 @@ public OrganizationInvitations(
     }
 
     @JsonIgnore
-    public java.util.List<OrganizationInvitation> data() {
+    public List<OrganizationInvitation> data() {
         return data;
     }
 
@@ -55,7 +56,7 @@ public final static Builder builder() {
         return new Builder();
     }
 
-    public OrganizationInvitations withData(java.util.List<OrganizationInvitation> data) {
+    public OrganizationInvitations withData(List<OrganizationInvitation> data) {
         Utils.checkNotNull(data, "data");
         this.data = data;
         return this;
@@ -81,13 +82,13 @@ public boolean equals(java.lang.Object o) {
         }
         OrganizationInvitations other = (OrganizationInvitations) o;
         return 
-            java.util.Objects.deepEquals(this.data, other.data) &&
-            java.util.Objects.deepEquals(this.totalCount, other.totalCount);
+            Objects.deepEquals(this.data, other.data) &&
+            Objects.deepEquals(this.totalCount, other.totalCount);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             data,
             totalCount);
     }
@@ -101,7 +102,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private java.util.List<OrganizationInvitation> data;
+        private List<OrganizationInvitation> data;
  
         private Long totalCount;  
         
@@ -109,7 +110,7 @@ private Builder() {
           // force use of static builder() method
         }
 
-        public Builder data(java.util.List<OrganizationInvitation> data) {
+        public Builder data(List<OrganizationInvitation> data) {
             Utils.checkNotNull(data, "data");
             this.data = data;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembership.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembership.java
index 7ccee75..05800fe 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembership.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembership.java
@@ -4,19 +4,21 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
+
 /**
  * OrganizationMembership - Hello world
  */
@@ -25,7 +27,7 @@ public class OrganizationMembership {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("id")
-    private Optional<? extends String> id;
+    private Optional<String> id;
 
     /**
      * String representing the object's type. Objects of the same type share the same value.
@@ -37,11 +39,11 @@ public class OrganizationMembership {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("role")
-    private Optional<? extends String> role;
+    private Optional<String> role;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("permissions")
-    private Optional<? extends java.util.List<String>> permissions;
+    private Optional<? extends List<String>> permissions;
 
     /**
      * Metadata saved on the organization membership, accessible from both Frontend and Backend APIs
@@ -70,27 +72,27 @@ public class OrganizationMembership {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("created_at")
-    private Optional<? extends Long> createdAt;
+    private Optional<Long> createdAt;
 
     /**
      * Unix timestamp of last update.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("updated_at")
-    private Optional<? extends Long> updatedAt;
+    private Optional<Long> updatedAt;
 
     @JsonCreator
     public OrganizationMembership(
-            @JsonProperty("id") Optional<? extends String> id,
+            @JsonProperty("id") Optional<String> id,
             @JsonProperty("object") Optional<? extends OrganizationMembershipObject> object,
-            @JsonProperty("role") Optional<? extends String> role,
-            @JsonProperty("permissions") Optional<? extends java.util.List<String>> permissions,
+            @JsonProperty("role") Optional<String> role,
+            @JsonProperty("permissions") Optional<? extends List<String>> permissions,
             @JsonProperty("public_metadata") Optional<? extends OrganizationMembershipPublicMetadata> publicMetadata,
             @JsonProperty("private_metadata") Optional<? extends OrganizationMembershipPrivateMetadata> privateMetadata,
             @JsonProperty("organization") Optional<? extends OrganizationMembershipOrganization> organization,
             @JsonProperty("public_user_data") Optional<? extends PublicUserData> publicUserData,
-            @JsonProperty("created_at") Optional<? extends Long> createdAt,
-            @JsonProperty("updated_at") Optional<? extends Long> updatedAt) {
+            @JsonProperty("created_at") Optional<Long> createdAt,
+            @JsonProperty("updated_at") Optional<Long> updatedAt) {
         Utils.checkNotNull(id, "id");
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(role, "role");
@@ -117,10 +119,9 @@ public OrganizationMembership() {
         this(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> id() {
-        return (Optional<String>) id;
+        return id;
     }
 
     /**
@@ -133,16 +134,15 @@ public Optional<OrganizationMembershipObject> object() {
         return (Optional<OrganizationMembershipObject>) object;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> role() {
-        return (Optional<String>) role;
+        return role;
     }
 
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> permissions() {
-        return (Optional<java.util.List<String>>) permissions;
+    public Optional<List<String>> permissions() {
+        return (Optional<List<String>>) permissions;
     }
 
     /**
@@ -178,19 +178,17 @@ public Optional<PublicUserData> publicUserData() {
     /**
      * Unix timestamp of creation.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> createdAt() {
-        return (Optional<Long>) createdAt;
+        return createdAt;
     }
 
     /**
      * Unix timestamp of last update.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> updatedAt() {
-        return (Optional<Long>) updatedAt;
+        return updatedAt;
     }
 
     public final static Builder builder() {
@@ -203,7 +201,7 @@ public OrganizationMembership withId(String id) {
         return this;
     }
 
-    public OrganizationMembership withId(Optional<? extends String> id) {
+    public OrganizationMembership withId(Optional<String> id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
@@ -235,19 +233,19 @@ public OrganizationMembership withRole(String role) {
         return this;
     }
 
-    public OrganizationMembership withRole(Optional<? extends String> role) {
+    public OrganizationMembership withRole(Optional<String> role) {
         Utils.checkNotNull(role, "role");
         this.role = role;
         return this;
     }
 
-    public OrganizationMembership withPermissions(java.util.List<String> permissions) {
+    public OrganizationMembership withPermissions(List<String> permissions) {
         Utils.checkNotNull(permissions, "permissions");
         this.permissions = Optional.ofNullable(permissions);
         return this;
     }
 
-    public OrganizationMembership withPermissions(Optional<? extends java.util.List<String>> permissions) {
+    public OrganizationMembership withPermissions(Optional<? extends List<String>> permissions) {
         Utils.checkNotNull(permissions, "permissions");
         this.permissions = permissions;
         return this;
@@ -325,7 +323,7 @@ public OrganizationMembership withCreatedAt(long createdAt) {
     /**
      * Unix timestamp of creation.
      */
-    public OrganizationMembership withCreatedAt(Optional<? extends Long> createdAt) {
+    public OrganizationMembership withCreatedAt(Optional<Long> createdAt) {
         Utils.checkNotNull(createdAt, "createdAt");
         this.createdAt = createdAt;
         return this;
@@ -343,7 +341,7 @@ public OrganizationMembership withUpdatedAt(long updatedAt) {
     /**
      * Unix timestamp of last update.
      */
-    public OrganizationMembership withUpdatedAt(Optional<? extends Long> updatedAt) {
+    public OrganizationMembership withUpdatedAt(Optional<Long> updatedAt) {
         Utils.checkNotNull(updatedAt, "updatedAt");
         this.updatedAt = updatedAt;
         return this;
@@ -359,21 +357,21 @@ public boolean equals(java.lang.Object o) {
         }
         OrganizationMembership other = (OrganizationMembership) o;
         return 
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.role, other.role) &&
-            java.util.Objects.deepEquals(this.permissions, other.permissions) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
-            java.util.Objects.deepEquals(this.organization, other.organization) &&
-            java.util.Objects.deepEquals(this.publicUserData, other.publicUserData) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.role, other.role) &&
+            Objects.deepEquals(this.permissions, other.permissions) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
+            Objects.deepEquals(this.organization, other.organization) &&
+            Objects.deepEquals(this.publicUserData, other.publicUserData) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             id,
             object,
             role,
@@ -403,13 +401,13 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> id = Optional.empty();
+        private Optional<String> id = Optional.empty();
  
         private Optional<? extends OrganizationMembershipObject> object = Optional.empty();
  
-        private Optional<? extends String> role = Optional.empty();
+        private Optional<String> role = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> permissions = Optional.empty();
+        private Optional<? extends List<String>> permissions = Optional.empty();
  
         private Optional<? extends OrganizationMembershipPublicMetadata> publicMetadata = Optional.empty();
  
@@ -419,9 +417,9 @@ public final static class Builder {
  
         private Optional<? extends PublicUserData> publicUserData = Optional.empty();
  
-        private Optional<? extends Long> createdAt = Optional.empty();
+        private Optional<Long> createdAt = Optional.empty();
  
-        private Optional<? extends Long> updatedAt = Optional.empty();  
+        private Optional<Long> updatedAt = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -433,7 +431,7 @@ public Builder id(String id) {
             return this;
         }
 
-        public Builder id(Optional<? extends String> id) {
+        public Builder id(Optional<String> id) {
             Utils.checkNotNull(id, "id");
             this.id = id;
             return this;
@@ -465,19 +463,19 @@ public Builder role(String role) {
             return this;
         }
 
-        public Builder role(Optional<? extends String> role) {
+        public Builder role(Optional<String> role) {
             Utils.checkNotNull(role, "role");
             this.role = role;
             return this;
         }
 
-        public Builder permissions(java.util.List<String> permissions) {
+        public Builder permissions(List<String> permissions) {
             Utils.checkNotNull(permissions, "permissions");
             this.permissions = Optional.ofNullable(permissions);
             return this;
         }
 
-        public Builder permissions(Optional<? extends java.util.List<String>> permissions) {
+        public Builder permissions(Optional<? extends List<String>> permissions) {
             Utils.checkNotNull(permissions, "permissions");
             this.permissions = permissions;
             return this;
@@ -555,7 +553,7 @@ public Builder createdAt(long createdAt) {
         /**
          * Unix timestamp of creation.
          */
-        public Builder createdAt(Optional<? extends Long> createdAt) {
+        public Builder createdAt(Optional<Long> createdAt) {
             Utils.checkNotNull(createdAt, "createdAt");
             this.createdAt = createdAt;
             return this;
@@ -573,7 +571,7 @@ public Builder updatedAt(long updatedAt) {
         /**
          * Unix timestamp of last update.
          */
-        public Builder updatedAt(Optional<? extends Long> updatedAt) {
+        public Builder updatedAt(Optional<Long> updatedAt) {
             Utils.checkNotNull(updatedAt, "updatedAt");
             this.updatedAt = updatedAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipObject.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipObject.java
index 7b90b40..b74f061 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * OrganizationMembershipObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganization.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganization.java
index 60fb323..6d5f3c8 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganization.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganization.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class OrganizationMembershipOrganization {
 
     @JsonProperty("object")
@@ -35,14 +36,14 @@ public class OrganizationMembershipOrganization {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("members_count")
-    private JsonNullable<? extends Long> membersCount;
+    private JsonNullable<Long> membersCount;
 
     @JsonProperty("max_allowed_memberships")
     private long maxAllowedMemberships;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("admin_delete_enabled")
-    private Optional<? extends Boolean> adminDeleteEnabled;
+    private Optional<Boolean> adminDeleteEnabled;
 
     @JsonProperty("public_metadata")
     private OrganizationMembershipOrganizationPublicMetadata publicMetadata;
@@ -52,7 +53,7 @@ public class OrganizationMembershipOrganization {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("created_by")
-    private Optional<? extends String> createdBy;
+    private Optional<String> createdBy;
 
     /**
      * Unix timestamp of creation.
@@ -74,12 +75,12 @@ public OrganizationMembershipOrganization(
             @JsonProperty("id") String id,
             @JsonProperty("name") String name,
             @JsonProperty("slug") String slug,
-            @JsonProperty("members_count") JsonNullable<? extends Long> membersCount,
+            @JsonProperty("members_count") JsonNullable<Long> membersCount,
             @JsonProperty("max_allowed_memberships") long maxAllowedMemberships,
-            @JsonProperty("admin_delete_enabled") Optional<? extends Boolean> adminDeleteEnabled,
+            @JsonProperty("admin_delete_enabled") Optional<Boolean> adminDeleteEnabled,
             @JsonProperty("public_metadata") OrganizationMembershipOrganizationPublicMetadata publicMetadata,
             @JsonProperty("private_metadata") OrganizationMembershipOrganizationPrivateMetadata privateMetadata,
-            @JsonProperty("created_by") Optional<? extends String> createdBy,
+            @JsonProperty("created_by") Optional<String> createdBy,
             @JsonProperty("created_at") long createdAt,
             @JsonProperty("updated_at") long updatedAt) {
         Utils.checkNotNull(object, "object");
@@ -141,10 +142,9 @@ public String slug() {
         return slug;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> membersCount() {
-        return (JsonNullable<Long>) membersCount;
+        return membersCount;
     }
 
     @JsonIgnore
@@ -152,10 +152,9 @@ public long maxAllowedMemberships() {
         return maxAllowedMemberships;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> adminDeleteEnabled() {
-        return (Optional<Boolean>) adminDeleteEnabled;
+        return adminDeleteEnabled;
     }
 
     @JsonIgnore
@@ -168,10 +167,9 @@ public OrganizationMembershipOrganizationPrivateMetadata privateMetadata() {
         return privateMetadata;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> createdBy() {
-        return (Optional<String>) createdBy;
+        return createdBy;
     }
 
     /**
@@ -226,7 +224,7 @@ public OrganizationMembershipOrganization withMembersCount(long membersCount) {
         return this;
     }
 
-    public OrganizationMembershipOrganization withMembersCount(JsonNullable<? extends Long> membersCount) {
+    public OrganizationMembershipOrganization withMembersCount(JsonNullable<Long> membersCount) {
         Utils.checkNotNull(membersCount, "membersCount");
         this.membersCount = membersCount;
         return this;
@@ -244,7 +242,7 @@ public OrganizationMembershipOrganization withAdminDeleteEnabled(boolean adminDe
         return this;
     }
 
-    public OrganizationMembershipOrganization withAdminDeleteEnabled(Optional<? extends Boolean> adminDeleteEnabled) {
+    public OrganizationMembershipOrganization withAdminDeleteEnabled(Optional<Boolean> adminDeleteEnabled) {
         Utils.checkNotNull(adminDeleteEnabled, "adminDeleteEnabled");
         this.adminDeleteEnabled = adminDeleteEnabled;
         return this;
@@ -268,7 +266,7 @@ public OrganizationMembershipOrganization withCreatedBy(String createdBy) {
         return this;
     }
 
-    public OrganizationMembershipOrganization withCreatedBy(Optional<? extends String> createdBy) {
+    public OrganizationMembershipOrganization withCreatedBy(Optional<String> createdBy) {
         Utils.checkNotNull(createdBy, "createdBy");
         this.createdBy = createdBy;
         return this;
@@ -304,23 +302,23 @@ public boolean equals(java.lang.Object o) {
         }
         OrganizationMembershipOrganization other = (OrganizationMembershipOrganization) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.slug, other.slug) &&
-            java.util.Objects.deepEquals(this.membersCount, other.membersCount) &&
-            java.util.Objects.deepEquals(this.maxAllowedMemberships, other.maxAllowedMemberships) &&
-            java.util.Objects.deepEquals(this.adminDeleteEnabled, other.adminDeleteEnabled) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
-            java.util.Objects.deepEquals(this.createdBy, other.createdBy) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.slug, other.slug) &&
+            Objects.deepEquals(this.membersCount, other.membersCount) &&
+            Objects.deepEquals(this.maxAllowedMemberships, other.maxAllowedMemberships) &&
+            Objects.deepEquals(this.adminDeleteEnabled, other.adminDeleteEnabled) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
+            Objects.deepEquals(this.createdBy, other.createdBy) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             name,
@@ -362,17 +360,17 @@ public final static class Builder {
  
         private String slug;
  
-        private JsonNullable<? extends Long> membersCount = JsonNullable.undefined();
+        private JsonNullable<Long> membersCount = JsonNullable.undefined();
  
         private Long maxAllowedMemberships;
  
-        private Optional<? extends Boolean> adminDeleteEnabled = Optional.empty();
+        private Optional<Boolean> adminDeleteEnabled = Optional.empty();
  
         private OrganizationMembershipOrganizationPublicMetadata publicMetadata;
  
         private OrganizationMembershipOrganizationPrivateMetadata privateMetadata;
  
-        private Optional<? extends String> createdBy = Optional.empty();
+        private Optional<String> createdBy = Optional.empty();
  
         private Long createdAt;
  
@@ -412,7 +410,7 @@ public Builder membersCount(long membersCount) {
             return this;
         }
 
-        public Builder membersCount(JsonNullable<? extends Long> membersCount) {
+        public Builder membersCount(JsonNullable<Long> membersCount) {
             Utils.checkNotNull(membersCount, "membersCount");
             this.membersCount = membersCount;
             return this;
@@ -430,7 +428,7 @@ public Builder adminDeleteEnabled(boolean adminDeleteEnabled) {
             return this;
         }
 
-        public Builder adminDeleteEnabled(Optional<? extends Boolean> adminDeleteEnabled) {
+        public Builder adminDeleteEnabled(Optional<Boolean> adminDeleteEnabled) {
             Utils.checkNotNull(adminDeleteEnabled, "adminDeleteEnabled");
             this.adminDeleteEnabled = adminDeleteEnabled;
             return this;
@@ -454,7 +452,7 @@ public Builder createdBy(String createdBy) {
             return this;
         }
 
-        public Builder createdBy(Optional<? extends String> createdBy) {
+        public Builder createdBy(Optional<String> createdBy) {
             Utils.checkNotNull(createdBy, "createdBy");
             this.createdBy = createdBy;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganizationObject.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganizationObject.java
index 15de061..c08c100 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganizationObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganizationObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum OrganizationMembershipOrganizationObject {
     ORGANIZATION("organization");
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganizationPrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganizationPrivateMetadata.java
index 08307cd..cd13d39 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganizationPrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganizationPrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class OrganizationMembershipOrganizationPrivateMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganizationPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganizationPublicMetadata.java
index 047c486..0aa71bd 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganizationPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipOrganizationPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class OrganizationMembershipOrganizationPublicMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipPrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipPrivateMetadata.java
index 2ad36f2..cdd9139 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipPrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipPrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * OrganizationMembershipPrivateMetadata - Metadata saved on the organization membership, accessible only from the Backend API
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipPublicMetadata.java
index 1252e73..00670c4 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationMembershipPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * OrganizationMembershipPublicMetadata - Metadata saved on the organization membership, accessible from both Frontend and Backend APIs
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationMemberships.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationMemberships.java
index cbe319d..425b9b0 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationMemberships.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationMemberships.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+
 
 public class OrganizationMemberships {
 
     @JsonProperty("data")
-    private java.util.List<OrganizationMembership> data;
+    private List<OrganizationMembership> data;
 
     /**
      * Total number of organization memberships
@@ -29,7 +30,7 @@ public class OrganizationMemberships {
 
     @JsonCreator
     public OrganizationMemberships(
-            @JsonProperty("data") java.util.List<OrganizationMembership> data,
+            @JsonProperty("data") List<OrganizationMembership> data,
             @JsonProperty("total_count") long totalCount) {
         Utils.checkNotNull(data, "data");
         Utils.checkNotNull(totalCount, "totalCount");
@@ -38,7 +39,7 @@ public OrganizationMemberships(
     }
 
     @JsonIgnore
-    public java.util.List<OrganizationMembership> data() {
+    public List<OrganizationMembership> data() {
         return data;
     }
 
@@ -55,7 +56,7 @@ public final static Builder builder() {
         return new Builder();
     }
 
-    public OrganizationMemberships withData(java.util.List<OrganizationMembership> data) {
+    public OrganizationMemberships withData(List<OrganizationMembership> data) {
         Utils.checkNotNull(data, "data");
         this.data = data;
         return this;
@@ -81,13 +82,13 @@ public boolean equals(java.lang.Object o) {
         }
         OrganizationMemberships other = (OrganizationMemberships) o;
         return 
-            java.util.Objects.deepEquals(this.data, other.data) &&
-            java.util.Objects.deepEquals(this.totalCount, other.totalCount);
+            Objects.deepEquals(this.data, other.data) &&
+            Objects.deepEquals(this.totalCount, other.totalCount);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             data,
             totalCount);
     }
@@ -101,7 +102,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private java.util.List<OrganizationMembership> data;
+        private List<OrganizationMembership> data;
  
         private Long totalCount;  
         
@@ -109,7 +110,7 @@ private Builder() {
           // force use of static builder() method
         }
 
-        public Builder data(java.util.List<OrganizationMembership> data) {
+        public Builder data(List<OrganizationMembership> data) {
             Utils.checkNotNull(data, "data");
             this.data = data;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationObject.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationObject.java
index e2a16ea..ef757d2 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum OrganizationObject {
     ORGANIZATION("organization");
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationPrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationPrivateMetadata.java
index b599dd6..0d7dd3a 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationPrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationPrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class OrganizationPrivateMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationPublicMetadata.java
index bb18481..55b8fe1 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class OrganizationPublicMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationSettings.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationSettings.java
index c4576cc..0b02cb2 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationSettings.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationSettings.java
@@ -4,20 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class OrganizationSettings {
 
     /**
@@ -34,11 +36,11 @@ public class OrganizationSettings {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("max_allowed_roles")
-    private Optional<? extends Long> maxAllowedRoles;
+    private Optional<Long> maxAllowedRoles;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("max_allowed_permissions")
-    private Optional<? extends Long> maxAllowedPermissions;
+    private Optional<Long> maxAllowedPermissions;
 
     /**
      * The role key that a user will be assigned after creating an organization.
@@ -56,7 +58,7 @@ public class OrganizationSettings {
     private boolean domainsEnabled;
 
     @JsonProperty("domains_enrollment_modes")
-    private java.util.List<DomainsEnrollmentModes> domainsEnrollmentModes;
+    private List<DomainsEnrollmentModes> domainsEnrollmentModes;
 
     /**
      * The role key that it will be used in order to create an organization invitation or suggestion.
@@ -69,12 +71,12 @@ public OrganizationSettings(
             @JsonProperty("object") OrganizationSettingsObject object,
             @JsonProperty("enabled") boolean enabled,
             @JsonProperty("max_allowed_memberships") long maxAllowedMemberships,
-            @JsonProperty("max_allowed_roles") Optional<? extends Long> maxAllowedRoles,
-            @JsonProperty("max_allowed_permissions") Optional<? extends Long> maxAllowedPermissions,
+            @JsonProperty("max_allowed_roles") Optional<Long> maxAllowedRoles,
+            @JsonProperty("max_allowed_permissions") Optional<Long> maxAllowedPermissions,
             @JsonProperty("creator_role") String creatorRole,
             @JsonProperty("admin_delete_enabled") boolean adminDeleteEnabled,
             @JsonProperty("domains_enabled") boolean domainsEnabled,
-            @JsonProperty("domains_enrollment_modes") java.util.List<DomainsEnrollmentModes> domainsEnrollmentModes,
+            @JsonProperty("domains_enrollment_modes") List<DomainsEnrollmentModes> domainsEnrollmentModes,
             @JsonProperty("domains_default_role") String domainsDefaultRole) {
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(enabled, "enabled");
@@ -105,7 +107,7 @@ public OrganizationSettings(
             String creatorRole,
             boolean adminDeleteEnabled,
             boolean domainsEnabled,
-            java.util.List<DomainsEnrollmentModes> domainsEnrollmentModes,
+            List<DomainsEnrollmentModes> domainsEnrollmentModes,
             String domainsDefaultRole) {
         this(object, enabled, maxAllowedMemberships, Optional.empty(), Optional.empty(), creatorRole, adminDeleteEnabled, domainsEnabled, domainsEnrollmentModes, domainsDefaultRole);
     }
@@ -128,16 +130,14 @@ public long maxAllowedMemberships() {
         return maxAllowedMemberships;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> maxAllowedRoles() {
-        return (Optional<Long>) maxAllowedRoles;
+        return maxAllowedRoles;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> maxAllowedPermissions() {
-        return (Optional<Long>) maxAllowedPermissions;
+        return maxAllowedPermissions;
     }
 
     /**
@@ -162,7 +162,7 @@ public boolean domainsEnabled() {
     }
 
     @JsonIgnore
-    public java.util.List<DomainsEnrollmentModes> domainsEnrollmentModes() {
+    public List<DomainsEnrollmentModes> domainsEnrollmentModes() {
         return domainsEnrollmentModes;
     }
 
@@ -205,7 +205,7 @@ public OrganizationSettings withMaxAllowedRoles(long maxAllowedRoles) {
         return this;
     }
 
-    public OrganizationSettings withMaxAllowedRoles(Optional<? extends Long> maxAllowedRoles) {
+    public OrganizationSettings withMaxAllowedRoles(Optional<Long> maxAllowedRoles) {
         Utils.checkNotNull(maxAllowedRoles, "maxAllowedRoles");
         this.maxAllowedRoles = maxAllowedRoles;
         return this;
@@ -217,7 +217,7 @@ public OrganizationSettings withMaxAllowedPermissions(long maxAllowedPermissions
         return this;
     }
 
-    public OrganizationSettings withMaxAllowedPermissions(Optional<? extends Long> maxAllowedPermissions) {
+    public OrganizationSettings withMaxAllowedPermissions(Optional<Long> maxAllowedPermissions) {
         Utils.checkNotNull(maxAllowedPermissions, "maxAllowedPermissions");
         this.maxAllowedPermissions = maxAllowedPermissions;
         return this;
@@ -247,7 +247,7 @@ public OrganizationSettings withDomainsEnabled(boolean domainsEnabled) {
         return this;
     }
 
-    public OrganizationSettings withDomainsEnrollmentModes(java.util.List<DomainsEnrollmentModes> domainsEnrollmentModes) {
+    public OrganizationSettings withDomainsEnrollmentModes(List<DomainsEnrollmentModes> domainsEnrollmentModes) {
         Utils.checkNotNull(domainsEnrollmentModes, "domainsEnrollmentModes");
         this.domainsEnrollmentModes = domainsEnrollmentModes;
         return this;
@@ -272,21 +272,21 @@ public boolean equals(java.lang.Object o) {
         }
         OrganizationSettings other = (OrganizationSettings) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.enabled, other.enabled) &&
-            java.util.Objects.deepEquals(this.maxAllowedMemberships, other.maxAllowedMemberships) &&
-            java.util.Objects.deepEquals(this.maxAllowedRoles, other.maxAllowedRoles) &&
-            java.util.Objects.deepEquals(this.maxAllowedPermissions, other.maxAllowedPermissions) &&
-            java.util.Objects.deepEquals(this.creatorRole, other.creatorRole) &&
-            java.util.Objects.deepEquals(this.adminDeleteEnabled, other.adminDeleteEnabled) &&
-            java.util.Objects.deepEquals(this.domainsEnabled, other.domainsEnabled) &&
-            java.util.Objects.deepEquals(this.domainsEnrollmentModes, other.domainsEnrollmentModes) &&
-            java.util.Objects.deepEquals(this.domainsDefaultRole, other.domainsDefaultRole);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.enabled, other.enabled) &&
+            Objects.deepEquals(this.maxAllowedMemberships, other.maxAllowedMemberships) &&
+            Objects.deepEquals(this.maxAllowedRoles, other.maxAllowedRoles) &&
+            Objects.deepEquals(this.maxAllowedPermissions, other.maxAllowedPermissions) &&
+            Objects.deepEquals(this.creatorRole, other.creatorRole) &&
+            Objects.deepEquals(this.adminDeleteEnabled, other.adminDeleteEnabled) &&
+            Objects.deepEquals(this.domainsEnabled, other.domainsEnabled) &&
+            Objects.deepEquals(this.domainsEnrollmentModes, other.domainsEnrollmentModes) &&
+            Objects.deepEquals(this.domainsDefaultRole, other.domainsDefaultRole);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             enabled,
             maxAllowedMemberships,
@@ -322,9 +322,9 @@ public final static class Builder {
  
         private Long maxAllowedMemberships;
  
-        private Optional<? extends Long> maxAllowedRoles = Optional.empty();
+        private Optional<Long> maxAllowedRoles = Optional.empty();
  
-        private Optional<? extends Long> maxAllowedPermissions = Optional.empty();
+        private Optional<Long> maxAllowedPermissions = Optional.empty();
  
         private String creatorRole;
  
@@ -332,7 +332,7 @@ public final static class Builder {
  
         private Boolean domainsEnabled;
  
-        private java.util.List<DomainsEnrollmentModes> domainsEnrollmentModes;
+        private List<DomainsEnrollmentModes> domainsEnrollmentModes;
  
         private String domainsDefaultRole;  
         
@@ -367,7 +367,7 @@ public Builder maxAllowedRoles(long maxAllowedRoles) {
             return this;
         }
 
-        public Builder maxAllowedRoles(Optional<? extends Long> maxAllowedRoles) {
+        public Builder maxAllowedRoles(Optional<Long> maxAllowedRoles) {
             Utils.checkNotNull(maxAllowedRoles, "maxAllowedRoles");
             this.maxAllowedRoles = maxAllowedRoles;
             return this;
@@ -379,7 +379,7 @@ public Builder maxAllowedPermissions(long maxAllowedPermissions) {
             return this;
         }
 
-        public Builder maxAllowedPermissions(Optional<? extends Long> maxAllowedPermissions) {
+        public Builder maxAllowedPermissions(Optional<Long> maxAllowedPermissions) {
             Utils.checkNotNull(maxAllowedPermissions, "maxAllowedPermissions");
             this.maxAllowedPermissions = maxAllowedPermissions;
             return this;
@@ -409,7 +409,7 @@ public Builder domainsEnabled(boolean domainsEnabled) {
             return this;
         }
 
-        public Builder domainsEnrollmentModes(java.util.List<DomainsEnrollmentModes> domainsEnrollmentModes) {
+        public Builder domainsEnrollmentModes(List<DomainsEnrollmentModes> domainsEnrollmentModes) {
             Utils.checkNotNull(domainsEnrollmentModes, "domainsEnrollmentModes");
             this.domainsEnrollmentModes = domainsEnrollmentModes;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationSettingsObject.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationSettingsObject.java
index c846198..228c57e 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationSettingsObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationSettingsObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * OrganizationSettingsObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogo.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogo.java
index fb626df..d91deef 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogo.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogo.java
@@ -4,21 +4,23 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
+import java.lang.Boolean;
 import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class OrganizationWithLogo {
 
     @JsonProperty("object")
@@ -35,14 +37,14 @@ public class OrganizationWithLogo {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("members_count")
-    private JsonNullable<? extends Long> membersCount;
+    private JsonNullable<Long> membersCount;
 
     @JsonProperty("max_allowed_memberships")
     private long maxAllowedMemberships;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("admin_delete_enabled")
-    private Optional<? extends Boolean> adminDeleteEnabled;
+    private Optional<Boolean> adminDeleteEnabled;
 
     @JsonProperty("public_metadata")
     private OrganizationWithLogoPublicMetadata publicMetadata;
@@ -52,7 +54,7 @@ public class OrganizationWithLogo {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("created_by")
-    private Optional<? extends String> createdBy;
+    private Optional<String> createdBy;
 
     /**
      * Unix timestamp of creation.
@@ -74,14 +76,14 @@ public class OrganizationWithLogo {
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("logo_url")
     @Deprecated
-    private Optional<? extends String> logoUrl;
+    private Optional<String> logoUrl;
 
     @JsonProperty("image_url")
     private String imageUrl;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("has_image")
-    private Optional<? extends Boolean> hasImage;
+    private Optional<Boolean> hasImage;
 
     @JsonCreator
     public OrganizationWithLogo(
@@ -89,17 +91,17 @@ public OrganizationWithLogo(
             @JsonProperty("id") String id,
             @JsonProperty("name") String name,
             @JsonProperty("slug") String slug,
-            @JsonProperty("members_count") JsonNullable<? extends Long> membersCount,
+            @JsonProperty("members_count") JsonNullable<Long> membersCount,
             @JsonProperty("max_allowed_memberships") long maxAllowedMemberships,
-            @JsonProperty("admin_delete_enabled") Optional<? extends Boolean> adminDeleteEnabled,
+            @JsonProperty("admin_delete_enabled") Optional<Boolean> adminDeleteEnabled,
             @JsonProperty("public_metadata") OrganizationWithLogoPublicMetadata publicMetadata,
             @JsonProperty("private_metadata") OrganizationWithLogoPrivateMetadata privateMetadata,
-            @JsonProperty("created_by") Optional<? extends String> createdBy,
+            @JsonProperty("created_by") Optional<String> createdBy,
             @JsonProperty("created_at") long createdAt,
             @JsonProperty("updated_at") long updatedAt,
-            @JsonProperty("logo_url") Optional<? extends String> logoUrl,
+            @JsonProperty("logo_url") Optional<String> logoUrl,
             @JsonProperty("image_url") String imageUrl,
-            @JsonProperty("has_image") Optional<? extends Boolean> hasImage) {
+            @JsonProperty("has_image") Optional<Boolean> hasImage) {
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(id, "id");
         Utils.checkNotNull(name, "name");
@@ -166,10 +168,9 @@ public String slug() {
         return slug;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> membersCount() {
-        return (JsonNullable<Long>) membersCount;
+        return membersCount;
     }
 
     @JsonIgnore
@@ -177,10 +178,9 @@ public long maxAllowedMemberships() {
         return maxAllowedMemberships;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> adminDeleteEnabled() {
-        return (Optional<Boolean>) adminDeleteEnabled;
+        return adminDeleteEnabled;
     }
 
     @JsonIgnore
@@ -193,10 +193,9 @@ public OrganizationWithLogoPrivateMetadata privateMetadata() {
         return privateMetadata;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> createdBy() {
-        return (Optional<String>) createdBy;
+        return createdBy;
     }
 
     /**
@@ -221,10 +220,9 @@ public long updatedAt() {
      * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> logoUrl() {
-        return (Optional<String>) logoUrl;
+        return logoUrl;
     }
 
     @JsonIgnore
@@ -232,10 +230,9 @@ public String imageUrl() {
         return imageUrl;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> hasImage() {
-        return (Optional<Boolean>) hasImage;
+        return hasImage;
     }
 
     public final static Builder builder() {
@@ -272,7 +269,7 @@ public OrganizationWithLogo withMembersCount(long membersCount) {
         return this;
     }
 
-    public OrganizationWithLogo withMembersCount(JsonNullable<? extends Long> membersCount) {
+    public OrganizationWithLogo withMembersCount(JsonNullable<Long> membersCount) {
         Utils.checkNotNull(membersCount, "membersCount");
         this.membersCount = membersCount;
         return this;
@@ -290,7 +287,7 @@ public OrganizationWithLogo withAdminDeleteEnabled(boolean adminDeleteEnabled) {
         return this;
     }
 
-    public OrganizationWithLogo withAdminDeleteEnabled(Optional<? extends Boolean> adminDeleteEnabled) {
+    public OrganizationWithLogo withAdminDeleteEnabled(Optional<Boolean> adminDeleteEnabled) {
         Utils.checkNotNull(adminDeleteEnabled, "adminDeleteEnabled");
         this.adminDeleteEnabled = adminDeleteEnabled;
         return this;
@@ -314,7 +311,7 @@ public OrganizationWithLogo withCreatedBy(String createdBy) {
         return this;
     }
 
-    public OrganizationWithLogo withCreatedBy(Optional<? extends String> createdBy) {
+    public OrganizationWithLogo withCreatedBy(Optional<String> createdBy) {
         Utils.checkNotNull(createdBy, "createdBy");
         this.createdBy = createdBy;
         return this;
@@ -354,7 +351,7 @@ public OrganizationWithLogo withLogoUrl(String logoUrl) {
      * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public OrganizationWithLogo withLogoUrl(Optional<? extends String> logoUrl) {
+    public OrganizationWithLogo withLogoUrl(Optional<String> logoUrl) {
         Utils.checkNotNull(logoUrl, "logoUrl");
         this.logoUrl = logoUrl;
         return this;
@@ -372,7 +369,7 @@ public OrganizationWithLogo withHasImage(boolean hasImage) {
         return this;
     }
 
-    public OrganizationWithLogo withHasImage(Optional<? extends Boolean> hasImage) {
+    public OrganizationWithLogo withHasImage(Optional<Boolean> hasImage) {
         Utils.checkNotNull(hasImage, "hasImage");
         this.hasImage = hasImage;
         return this;
@@ -388,26 +385,26 @@ public boolean equals(java.lang.Object o) {
         }
         OrganizationWithLogo other = (OrganizationWithLogo) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.slug, other.slug) &&
-            java.util.Objects.deepEquals(this.membersCount, other.membersCount) &&
-            java.util.Objects.deepEquals(this.maxAllowedMemberships, other.maxAllowedMemberships) &&
-            java.util.Objects.deepEquals(this.adminDeleteEnabled, other.adminDeleteEnabled) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
-            java.util.Objects.deepEquals(this.createdBy, other.createdBy) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt) &&
-            java.util.Objects.deepEquals(this.logoUrl, other.logoUrl) &&
-            java.util.Objects.deepEquals(this.imageUrl, other.imageUrl) &&
-            java.util.Objects.deepEquals(this.hasImage, other.hasImage);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.slug, other.slug) &&
+            Objects.deepEquals(this.membersCount, other.membersCount) &&
+            Objects.deepEquals(this.maxAllowedMemberships, other.maxAllowedMemberships) &&
+            Objects.deepEquals(this.adminDeleteEnabled, other.adminDeleteEnabled) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
+            Objects.deepEquals(this.createdBy, other.createdBy) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt) &&
+            Objects.deepEquals(this.logoUrl, other.logoUrl) &&
+            Objects.deepEquals(this.imageUrl, other.imageUrl) &&
+            Objects.deepEquals(this.hasImage, other.hasImage);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             name,
@@ -455,28 +452,28 @@ public final static class Builder {
  
         private String slug;
  
-        private JsonNullable<? extends Long> membersCount = JsonNullable.undefined();
+        private JsonNullable<Long> membersCount = JsonNullable.undefined();
  
         private Long maxAllowedMemberships;
  
-        private Optional<? extends Boolean> adminDeleteEnabled = Optional.empty();
+        private Optional<Boolean> adminDeleteEnabled = Optional.empty();
  
         private OrganizationWithLogoPublicMetadata publicMetadata;
  
         private OrganizationWithLogoPrivateMetadata privateMetadata;
  
-        private Optional<? extends String> createdBy = Optional.empty();
+        private Optional<String> createdBy = Optional.empty();
  
         private Long createdAt;
  
         private Long updatedAt;
  
         @Deprecated
-        private Optional<? extends String> logoUrl = Optional.empty();
+        private Optional<String> logoUrl = Optional.empty();
  
         private String imageUrl;
  
-        private Optional<? extends Boolean> hasImage = Optional.empty();  
+        private Optional<Boolean> hasImage = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -512,7 +509,7 @@ public Builder membersCount(long membersCount) {
             return this;
         }
 
-        public Builder membersCount(JsonNullable<? extends Long> membersCount) {
+        public Builder membersCount(JsonNullable<Long> membersCount) {
             Utils.checkNotNull(membersCount, "membersCount");
             this.membersCount = membersCount;
             return this;
@@ -530,7 +527,7 @@ public Builder adminDeleteEnabled(boolean adminDeleteEnabled) {
             return this;
         }
 
-        public Builder adminDeleteEnabled(Optional<? extends Boolean> adminDeleteEnabled) {
+        public Builder adminDeleteEnabled(Optional<Boolean> adminDeleteEnabled) {
             Utils.checkNotNull(adminDeleteEnabled, "adminDeleteEnabled");
             this.adminDeleteEnabled = adminDeleteEnabled;
             return this;
@@ -554,7 +551,7 @@ public Builder createdBy(String createdBy) {
             return this;
         }
 
-        public Builder createdBy(Optional<? extends String> createdBy) {
+        public Builder createdBy(Optional<String> createdBy) {
             Utils.checkNotNull(createdBy, "createdBy");
             this.createdBy = createdBy;
             return this;
@@ -594,7 +591,7 @@ public Builder logoUrl(String logoUrl) {
          * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
          */
         @Deprecated
-        public Builder logoUrl(Optional<? extends String> logoUrl) {
+        public Builder logoUrl(Optional<String> logoUrl) {
             Utils.checkNotNull(logoUrl, "logoUrl");
             this.logoUrl = logoUrl;
             return this;
@@ -612,7 +609,7 @@ public Builder hasImage(boolean hasImage) {
             return this;
         }
 
-        public Builder hasImage(Optional<? extends Boolean> hasImage) {
+        public Builder hasImage(Optional<Boolean> hasImage) {
             Utils.checkNotNull(hasImage, "hasImage");
             this.hasImage = hasImage;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogoObject.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogoObject.java
index 692d86c..5653d11 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogoObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogoObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum OrganizationWithLogoObject {
     ORGANIZATION("organization");
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogoPrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogoPrivateMetadata.java
index c9a080a..ba13397 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogoPrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogoPrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class OrganizationWithLogoPrivateMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogoPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogoPublicMetadata.java
index 67a58e4..d2ae0e4 100644
--- a/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogoPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/OrganizationWithLogoPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class OrganizationWithLogoPublicMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/Organizations.java b/src/main/java/com/clerk/backend_api/models/components/Organizations.java
index a8dc659..1212801 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Organizations.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Organizations.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+
 
 public class Organizations {
 
     @JsonProperty("data")
-    private java.util.List<Organization> data;
+    private List<Organization> data;
 
     /**
      * Total number of organizations
@@ -29,7 +30,7 @@ public class Organizations {
 
     @JsonCreator
     public Organizations(
-            @JsonProperty("data") java.util.List<Organization> data,
+            @JsonProperty("data") List<Organization> data,
             @JsonProperty("total_count") long totalCount) {
         Utils.checkNotNull(data, "data");
         Utils.checkNotNull(totalCount, "totalCount");
@@ -38,7 +39,7 @@ public Organizations(
     }
 
     @JsonIgnore
-    public java.util.List<Organization> data() {
+    public List<Organization> data() {
         return data;
     }
 
@@ -55,7 +56,7 @@ public final static Builder builder() {
         return new Builder();
     }
 
-    public Organizations withData(java.util.List<Organization> data) {
+    public Organizations withData(List<Organization> data) {
         Utils.checkNotNull(data, "data");
         this.data = data;
         return this;
@@ -81,13 +82,13 @@ public boolean equals(java.lang.Object o) {
         }
         Organizations other = (Organizations) o;
         return 
-            java.util.Objects.deepEquals(this.data, other.data) &&
-            java.util.Objects.deepEquals(this.totalCount, other.totalCount);
+            Objects.deepEquals(this.data, other.data) &&
+            Objects.deepEquals(this.totalCount, other.totalCount);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             data,
             totalCount);
     }
@@ -101,7 +102,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private java.util.List<Organization> data;
+        private List<Organization> data;
  
         private Long totalCount;  
         
@@ -109,7 +110,7 @@ private Builder() {
           // force use of static builder() method
         }
 
-        public Builder data(java.util.List<Organization> data) {
+        public Builder data(List<Organization> data) {
             Utils.checkNotNull(data, "data");
             this.data = data;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/Otp.java b/src/main/java/com/clerk/backend_api/models/components/Otp.java
index 549835b..f732fb9 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Otp.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Otp.java
@@ -4,16 +4,19 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+import java.util.Optional;
+
 
 public class Otp {
 
@@ -23,18 +26,20 @@ public class Otp {
     @JsonProperty("strategy")
     private Strategy strategy;
 
+    @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("attempts")
-    private long attempts;
+    private Optional<Long> attempts;
 
+    @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("expire_at")
-    private long expireAt;
+    private Optional<Long> expireAt;
 
     @JsonCreator
     public Otp(
             @JsonProperty("status") VerificationStatus status,
             @JsonProperty("strategy") Strategy strategy,
-            @JsonProperty("attempts") long attempts,
-            @JsonProperty("expire_at") long expireAt) {
+            @JsonProperty("attempts") Optional<Long> attempts,
+            @JsonProperty("expire_at") Optional<Long> expireAt) {
         Utils.checkNotNull(status, "status");
         Utils.checkNotNull(strategy, "strategy");
         Utils.checkNotNull(attempts, "attempts");
@@ -44,6 +49,12 @@ public Otp(
         this.attempts = attempts;
         this.expireAt = expireAt;
     }
+    
+    public Otp(
+            VerificationStatus status,
+            Strategy strategy) {
+        this(status, strategy, Optional.empty(), Optional.empty());
+    }
 
     @JsonIgnore
     public VerificationStatus status() {
@@ -56,12 +67,12 @@ public Strategy strategy() {
     }
 
     @JsonIgnore
-    public long attempts() {
+    public Optional<Long> attempts() {
         return attempts;
     }
 
     @JsonIgnore
-    public long expireAt() {
+    public Optional<Long> expireAt() {
         return expireAt;
     }
 
@@ -82,12 +93,24 @@ public Otp withStrategy(Strategy strategy) {
     }
 
     public Otp withAttempts(long attempts) {
+        Utils.checkNotNull(attempts, "attempts");
+        this.attempts = Optional.ofNullable(attempts);
+        return this;
+    }
+
+    public Otp withAttempts(Optional<Long> attempts) {
         Utils.checkNotNull(attempts, "attempts");
         this.attempts = attempts;
         return this;
     }
 
     public Otp withExpireAt(long expireAt) {
+        Utils.checkNotNull(expireAt, "expireAt");
+        this.expireAt = Optional.ofNullable(expireAt);
+        return this;
+    }
+
+    public Otp withExpireAt(Optional<Long> expireAt) {
         Utils.checkNotNull(expireAt, "expireAt");
         this.expireAt = expireAt;
         return this;
@@ -103,15 +126,15 @@ public boolean equals(java.lang.Object o) {
         }
         Otp other = (Otp) o;
         return 
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.strategy, other.strategy) &&
-            java.util.Objects.deepEquals(this.attempts, other.attempts) &&
-            java.util.Objects.deepEquals(this.expireAt, other.expireAt);
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.strategy, other.strategy) &&
+            Objects.deepEquals(this.attempts, other.attempts) &&
+            Objects.deepEquals(this.expireAt, other.expireAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             status,
             strategy,
             attempts,
@@ -133,9 +156,9 @@ public final static class Builder {
  
         private Strategy strategy;
  
-        private Long attempts;
+        private Optional<Long> attempts = Optional.empty();
  
-        private Long expireAt;  
+        private Optional<Long> expireAt = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -154,12 +177,24 @@ public Builder strategy(Strategy strategy) {
         }
 
         public Builder attempts(long attempts) {
+            Utils.checkNotNull(attempts, "attempts");
+            this.attempts = Optional.ofNullable(attempts);
+            return this;
+        }
+
+        public Builder attempts(Optional<Long> attempts) {
             Utils.checkNotNull(attempts, "attempts");
             this.attempts = attempts;
             return this;
         }
 
         public Builder expireAt(long expireAt) {
+            Utils.checkNotNull(expireAt, "expireAt");
+            this.expireAt = Optional.ofNullable(expireAt);
+            return this;
+        }
+
+        public Builder expireAt(Optional<Long> expireAt) {
             Utils.checkNotNull(expireAt, "expireAt");
             this.expireAt = expireAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/Passkey.java b/src/main/java/com/clerk/backend_api/models/components/Passkey.java
index b2a7107..6d5f530 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Passkey.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Passkey.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class Passkey {
 
     @JsonProperty("status")
@@ -33,19 +34,19 @@ public class Passkey {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("attempts")
-    private JsonNullable<? extends Long> attempts;
+    private JsonNullable<Long> attempts;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("expire_at")
-    private JsonNullable<? extends Long> expireAt;
+    private JsonNullable<Long> expireAt;
 
     @JsonCreator
     public Passkey(
             @JsonProperty("status") PasskeyVerificationStatus status,
             @JsonProperty("strategy") PasskeyVerificationStrategy strategy,
             @JsonProperty("nonce") Optional<? extends VerificationNonce> nonce,
-            @JsonProperty("attempts") JsonNullable<? extends Long> attempts,
-            @JsonProperty("expire_at") JsonNullable<? extends Long> expireAt) {
+            @JsonProperty("attempts") JsonNullable<Long> attempts,
+            @JsonProperty("expire_at") JsonNullable<Long> expireAt) {
         Utils.checkNotNull(status, "status");
         Utils.checkNotNull(strategy, "strategy");
         Utils.checkNotNull(nonce, "nonce");
@@ -80,16 +81,14 @@ public Optional<VerificationNonce> nonce() {
         return (Optional<VerificationNonce>) nonce;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> attempts() {
-        return (JsonNullable<Long>) attempts;
+        return attempts;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> expireAt() {
-        return (JsonNullable<Long>) expireAt;
+        return expireAt;
     }
 
     public final static Builder builder() {
@@ -126,7 +125,7 @@ public Passkey withAttempts(long attempts) {
         return this;
     }
 
-    public Passkey withAttempts(JsonNullable<? extends Long> attempts) {
+    public Passkey withAttempts(JsonNullable<Long> attempts) {
         Utils.checkNotNull(attempts, "attempts");
         this.attempts = attempts;
         return this;
@@ -138,7 +137,7 @@ public Passkey withExpireAt(long expireAt) {
         return this;
     }
 
-    public Passkey withExpireAt(JsonNullable<? extends Long> expireAt) {
+    public Passkey withExpireAt(JsonNullable<Long> expireAt) {
         Utils.checkNotNull(expireAt, "expireAt");
         this.expireAt = expireAt;
         return this;
@@ -154,16 +153,16 @@ public boolean equals(java.lang.Object o) {
         }
         Passkey other = (Passkey) o;
         return 
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.strategy, other.strategy) &&
-            java.util.Objects.deepEquals(this.nonce, other.nonce) &&
-            java.util.Objects.deepEquals(this.attempts, other.attempts) &&
-            java.util.Objects.deepEquals(this.expireAt, other.expireAt);
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.strategy, other.strategy) &&
+            Objects.deepEquals(this.nonce, other.nonce) &&
+            Objects.deepEquals(this.attempts, other.attempts) &&
+            Objects.deepEquals(this.expireAt, other.expireAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             status,
             strategy,
             nonce,
@@ -189,9 +188,9 @@ public final static class Builder {
  
         private Optional<? extends VerificationNonce> nonce = Optional.empty();
  
-        private JsonNullable<? extends Long> attempts = JsonNullable.undefined();
+        private JsonNullable<Long> attempts = JsonNullable.undefined();
  
-        private JsonNullable<? extends Long> expireAt = JsonNullable.undefined();  
+        private JsonNullable<Long> expireAt = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -227,7 +226,7 @@ public Builder attempts(long attempts) {
             return this;
         }
 
-        public Builder attempts(JsonNullable<? extends Long> attempts) {
+        public Builder attempts(JsonNullable<Long> attempts) {
             Utils.checkNotNull(attempts, "attempts");
             this.attempts = attempts;
             return this;
@@ -239,7 +238,7 @@ public Builder expireAt(long expireAt) {
             return this;
         }
 
-        public Builder expireAt(JsonNullable<? extends Long> expireAt) {
+        public Builder expireAt(JsonNullable<Long> expireAt) {
             Utils.checkNotNull(expireAt, "expireAt");
             this.expireAt = expireAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/PasskeyVerificationStatus.java b/src/main/java/com/clerk/backend_api/models/components/PasskeyVerificationStatus.java
index 7ac101a..5392d72 100644
--- a/src/main/java/com/clerk/backend_api/models/components/PasskeyVerificationStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/PasskeyVerificationStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum PasskeyVerificationStatus {
     VERIFIED("verified");
diff --git a/src/main/java/com/clerk/backend_api/models/components/PasskeyVerificationStrategy.java b/src/main/java/com/clerk/backend_api/models/components/PasskeyVerificationStrategy.java
index c919ad8..27bf974 100644
--- a/src/main/java/com/clerk/backend_api/models/components/PasskeyVerificationStrategy.java
+++ b/src/main/java/com/clerk/backend_api/models/components/PasskeyVerificationStrategy.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum PasskeyVerificationStrategy {
     PASSKEY("passkey");
diff --git a/src/main/java/com/clerk/backend_api/models/components/PhoneNumber.java b/src/main/java/com/clerk/backend_api/models/components/PhoneNumber.java
index de05666..9d73d9e 100644
--- a/src/main/java/com/clerk/backend_api/models/components/PhoneNumber.java
+++ b/src/main/java/com/clerk/backend_api/models/components/PhoneNumber.java
@@ -4,26 +4,29 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class PhoneNumber {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("id")
-    private Optional<? extends String> id;
+    private Optional<String> id;
 
     /**
      * String representing the object's type. Objects of the same type share the same value.
@@ -37,11 +40,11 @@ public class PhoneNumber {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("reserved_for_second_factor")
-    private Optional<? extends Boolean> reservedForSecondFactor;
+    private Optional<Boolean> reservedForSecondFactor;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("default_second_factor")
-    private Optional<? extends Boolean> defaultSecondFactor;
+    private Optional<Boolean> defaultSecondFactor;
 
     @JsonProperty("reserved")
     private boolean reserved;
@@ -51,11 +54,11 @@ public class PhoneNumber {
     private Optional<? extends PhoneNumberVerification> verification;
 
     @JsonProperty("linked_to")
-    private java.util.List<IdentificationLink> linkedTo;
+    private List<IdentificationLink> linkedTo;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("backup_codes")
-    private JsonNullable<? extends java.util.List<String>> backupCodes;
+    private JsonNullable<? extends List<String>> backupCodes;
 
     /**
      * Unix timestamp of creation
@@ -73,15 +76,15 @@ public class PhoneNumber {
 
     @JsonCreator
     public PhoneNumber(
-            @JsonProperty("id") Optional<? extends String> id,
+            @JsonProperty("id") Optional<String> id,
             @JsonProperty("object") PhoneNumberObject object,
             @JsonProperty("phone_number") String phoneNumber,
-            @JsonProperty("reserved_for_second_factor") Optional<? extends Boolean> reservedForSecondFactor,
-            @JsonProperty("default_second_factor") Optional<? extends Boolean> defaultSecondFactor,
+            @JsonProperty("reserved_for_second_factor") Optional<Boolean> reservedForSecondFactor,
+            @JsonProperty("default_second_factor") Optional<Boolean> defaultSecondFactor,
             @JsonProperty("reserved") boolean reserved,
             @JsonProperty("verification") Optional<? extends PhoneNumberVerification> verification,
-            @JsonProperty("linked_to") java.util.List<IdentificationLink> linkedTo,
-            @JsonProperty("backup_codes") JsonNullable<? extends java.util.List<String>> backupCodes,
+            @JsonProperty("linked_to") List<IdentificationLink> linkedTo,
+            @JsonProperty("backup_codes") JsonNullable<? extends List<String>> backupCodes,
             @JsonProperty("created_at") long createdAt,
             @JsonProperty("updated_at") long updatedAt) {
         Utils.checkNotNull(id, "id");
@@ -112,16 +115,15 @@ public PhoneNumber(
             PhoneNumberObject object,
             String phoneNumber,
             boolean reserved,
-            java.util.List<IdentificationLink> linkedTo,
+            List<IdentificationLink> linkedTo,
             long createdAt,
             long updatedAt) {
         this(Optional.empty(), object, phoneNumber, Optional.empty(), Optional.empty(), reserved, Optional.empty(), linkedTo, JsonNullable.undefined(), createdAt, updatedAt);
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> id() {
-        return (Optional<String>) id;
+        return id;
     }
 
     /**
@@ -138,16 +140,14 @@ public String phoneNumber() {
         return phoneNumber;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> reservedForSecondFactor() {
-        return (Optional<Boolean>) reservedForSecondFactor;
+        return reservedForSecondFactor;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> defaultSecondFactor() {
-        return (Optional<Boolean>) defaultSecondFactor;
+        return defaultSecondFactor;
     }
 
     @JsonIgnore
@@ -162,14 +162,14 @@ public Optional<PhoneNumberVerification> verification() {
     }
 
     @JsonIgnore
-    public java.util.List<IdentificationLink> linkedTo() {
+    public List<IdentificationLink> linkedTo() {
         return linkedTo;
     }
 
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public JsonNullable<java.util.List<String>> backupCodes() {
-        return (JsonNullable<java.util.List<String>>) backupCodes;
+    public JsonNullable<List<String>> backupCodes() {
+        return (JsonNullable<List<String>>) backupCodes;
     }
 
     /**
@@ -200,7 +200,7 @@ public PhoneNumber withId(String id) {
         return this;
     }
 
-    public PhoneNumber withId(Optional<? extends String> id) {
+    public PhoneNumber withId(Optional<String> id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
@@ -228,7 +228,7 @@ public PhoneNumber withReservedForSecondFactor(boolean reservedForSecondFactor)
         return this;
     }
 
-    public PhoneNumber withReservedForSecondFactor(Optional<? extends Boolean> reservedForSecondFactor) {
+    public PhoneNumber withReservedForSecondFactor(Optional<Boolean> reservedForSecondFactor) {
         Utils.checkNotNull(reservedForSecondFactor, "reservedForSecondFactor");
         this.reservedForSecondFactor = reservedForSecondFactor;
         return this;
@@ -240,7 +240,7 @@ public PhoneNumber withDefaultSecondFactor(boolean defaultSecondFactor) {
         return this;
     }
 
-    public PhoneNumber withDefaultSecondFactor(Optional<? extends Boolean> defaultSecondFactor) {
+    public PhoneNumber withDefaultSecondFactor(Optional<Boolean> defaultSecondFactor) {
         Utils.checkNotNull(defaultSecondFactor, "defaultSecondFactor");
         this.defaultSecondFactor = defaultSecondFactor;
         return this;
@@ -264,19 +264,19 @@ public PhoneNumber withVerification(Optional<? extends PhoneNumberVerification>
         return this;
     }
 
-    public PhoneNumber withLinkedTo(java.util.List<IdentificationLink> linkedTo) {
+    public PhoneNumber withLinkedTo(List<IdentificationLink> linkedTo) {
         Utils.checkNotNull(linkedTo, "linkedTo");
         this.linkedTo = linkedTo;
         return this;
     }
 
-    public PhoneNumber withBackupCodes(java.util.List<String> backupCodes) {
+    public PhoneNumber withBackupCodes(List<String> backupCodes) {
         Utils.checkNotNull(backupCodes, "backupCodes");
         this.backupCodes = JsonNullable.of(backupCodes);
         return this;
     }
 
-    public PhoneNumber withBackupCodes(JsonNullable<? extends java.util.List<String>> backupCodes) {
+    public PhoneNumber withBackupCodes(JsonNullable<? extends List<String>> backupCodes) {
         Utils.checkNotNull(backupCodes, "backupCodes");
         this.backupCodes = backupCodes;
         return this;
@@ -312,22 +312,22 @@ public boolean equals(java.lang.Object o) {
         }
         PhoneNumber other = (PhoneNumber) o;
         return 
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.phoneNumber, other.phoneNumber) &&
-            java.util.Objects.deepEquals(this.reservedForSecondFactor, other.reservedForSecondFactor) &&
-            java.util.Objects.deepEquals(this.defaultSecondFactor, other.defaultSecondFactor) &&
-            java.util.Objects.deepEquals(this.reserved, other.reserved) &&
-            java.util.Objects.deepEquals(this.verification, other.verification) &&
-            java.util.Objects.deepEquals(this.linkedTo, other.linkedTo) &&
-            java.util.Objects.deepEquals(this.backupCodes, other.backupCodes) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.phoneNumber, other.phoneNumber) &&
+            Objects.deepEquals(this.reservedForSecondFactor, other.reservedForSecondFactor) &&
+            Objects.deepEquals(this.defaultSecondFactor, other.defaultSecondFactor) &&
+            Objects.deepEquals(this.reserved, other.reserved) &&
+            Objects.deepEquals(this.verification, other.verification) &&
+            Objects.deepEquals(this.linkedTo, other.linkedTo) &&
+            Objects.deepEquals(this.backupCodes, other.backupCodes) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             id,
             object,
             phoneNumber,
@@ -359,23 +359,23 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> id = Optional.empty();
+        private Optional<String> id = Optional.empty();
  
         private PhoneNumberObject object;
  
         private String phoneNumber;
  
-        private Optional<? extends Boolean> reservedForSecondFactor = Optional.empty();
+        private Optional<Boolean> reservedForSecondFactor = Optional.empty();
  
-        private Optional<? extends Boolean> defaultSecondFactor = Optional.empty();
+        private Optional<Boolean> defaultSecondFactor = Optional.empty();
  
         private Boolean reserved;
  
         private Optional<? extends PhoneNumberVerification> verification = Optional.empty();
  
-        private java.util.List<IdentificationLink> linkedTo;
+        private List<IdentificationLink> linkedTo;
  
-        private JsonNullable<? extends java.util.List<String>> backupCodes = JsonNullable.undefined();
+        private JsonNullable<? extends List<String>> backupCodes = JsonNullable.undefined();
  
         private Long createdAt;
  
@@ -391,7 +391,7 @@ public Builder id(String id) {
             return this;
         }
 
-        public Builder id(Optional<? extends String> id) {
+        public Builder id(Optional<String> id) {
             Utils.checkNotNull(id, "id");
             this.id = id;
             return this;
@@ -419,7 +419,7 @@ public Builder reservedForSecondFactor(boolean reservedForSecondFactor) {
             return this;
         }
 
-        public Builder reservedForSecondFactor(Optional<? extends Boolean> reservedForSecondFactor) {
+        public Builder reservedForSecondFactor(Optional<Boolean> reservedForSecondFactor) {
             Utils.checkNotNull(reservedForSecondFactor, "reservedForSecondFactor");
             this.reservedForSecondFactor = reservedForSecondFactor;
             return this;
@@ -431,7 +431,7 @@ public Builder defaultSecondFactor(boolean defaultSecondFactor) {
             return this;
         }
 
-        public Builder defaultSecondFactor(Optional<? extends Boolean> defaultSecondFactor) {
+        public Builder defaultSecondFactor(Optional<Boolean> defaultSecondFactor) {
             Utils.checkNotNull(defaultSecondFactor, "defaultSecondFactor");
             this.defaultSecondFactor = defaultSecondFactor;
             return this;
@@ -455,19 +455,19 @@ public Builder verification(Optional<? extends PhoneNumberVerification> verifica
             return this;
         }
 
-        public Builder linkedTo(java.util.List<IdentificationLink> linkedTo) {
+        public Builder linkedTo(List<IdentificationLink> linkedTo) {
             Utils.checkNotNull(linkedTo, "linkedTo");
             this.linkedTo = linkedTo;
             return this;
         }
 
-        public Builder backupCodes(java.util.List<String> backupCodes) {
+        public Builder backupCodes(List<String> backupCodes) {
             Utils.checkNotNull(backupCodes, "backupCodes");
             this.backupCodes = JsonNullable.of(backupCodes);
             return this;
         }
 
-        public Builder backupCodes(JsonNullable<? extends java.util.List<String>> backupCodes) {
+        public Builder backupCodes(JsonNullable<? extends List<String>> backupCodes) {
             Utils.checkNotNull(backupCodes, "backupCodes");
             this.backupCodes = backupCodes;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/PhoneNumberObject.java b/src/main/java/com/clerk/backend_api/models/components/PhoneNumberObject.java
index 121018e..0fb697e 100644
--- a/src/main/java/com/clerk/backend_api/models/components/PhoneNumberObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/PhoneNumberObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * PhoneNumberObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/PhoneNumberVerification.java b/src/main/java/com/clerk/backend_api/models/components/PhoneNumberVerification.java
index b0e11a1..9c76fc9 100644
--- a/src/main/java/com/clerk/backend_api/models/components/PhoneNumberVerification.java
+++ b/src/main/java/com/clerk/backend_api/models/components/PhoneNumberVerification.java
@@ -4,28 +4,25 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
 
-import java.time.OffsetDateTime;
-import java.time.LocalDate;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.clerk.backend_api.utils.OneOfDeserializer;
 import com.clerk.backend_api.utils.TypedObject;
 import com.clerk.backend_api.utils.Utils.JsonShape;
+import com.clerk.backend_api.utils.Utils.TypeReferenceWithShape;
+import com.clerk.backend_api.utils.Utils;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 
 
 @JsonDeserialize(using = PhoneNumberVerification._Deserializer.class)
 public class PhoneNumberVerification {
 
-    @com.fasterxml.jackson.annotation.JsonValue
+    @JsonValue
     private TypedObject value;
     
     private PhoneNumberVerification(TypedObject value) {
@@ -45,8 +42,8 @@ public static PhoneNumberVerification of(VerificationAdmin value) {
     /**
      * Returns an instance of one of these types:
      * <ul>
-     * <li>{@code VerificationOTP}</li>
-     * <li>{@code VerificationAdmin}</li>
+     * <li>{@code com.clerk.backend_api.models.components.VerificationOTP}</li>
+     * <li>{@code com.clerk.backend_api.models.components.VerificationAdmin}</li>
      * </ul>
      * 
      * <p>Use {@code instanceof} to determine what type is returned. For example:
@@ -73,21 +70,21 @@ public boolean equals(java.lang.Object o) {
             return false;
         }
         PhoneNumberVerification other = (PhoneNumberVerification) o;
-        return java.util.Objects.deepEquals(this.value.value(), other.value.value()); 
+        return Objects.deepEquals(this.value.value(), other.value.value()); 
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(value.value());
+        return Objects.hash(value.value());
     }
     
     @SuppressWarnings("serial")
-    public static final class _Deserializer extends com.clerk.backend_api.utils.OneOfDeserializer<PhoneNumberVerification> {
+    public static final class _Deserializer extends OneOfDeserializer<PhoneNumberVerification> {
 
         public _Deserializer() {
             super(PhoneNumberVerification.class,
-                  Utils.TypeReferenceWithShape.of(new TypeReference<VerificationOTP>() {}, Utils.JsonShape.DEFAULT),
-                  Utils.TypeReferenceWithShape.of(new TypeReference<VerificationAdmin>() {}, Utils.JsonShape.DEFAULT));
+                  TypeReferenceWithShape.of(new TypeReference<com.clerk.backend_api.models.components.VerificationOTP>() {}, JsonShape.DEFAULT),
+                  TypeReferenceWithShape.of(new TypeReference<com.clerk.backend_api.models.components.VerificationAdmin>() {}, JsonShape.DEFAULT));
         }
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/PrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/components/PrivateMetadata.java
index 6c8f0f0..92a2e29 100644
--- a/src/main/java/com/clerk/backend_api/models/components/PrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/PrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class PrivateMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/ProxyCheck.java b/src/main/java/com/clerk/backend_api/models/components/ProxyCheck.java
index 2b80ffe..016b22e 100644
--- a/src/main/java/com/clerk/backend_api/models/components/ProxyCheck.java
+++ b/src/main/java/com/clerk/backend_api/models/components/ProxyCheck.java
@@ -4,16 +4,17 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class ProxyCheck {
 
@@ -171,19 +172,19 @@ public boolean equals(java.lang.Object o) {
         }
         ProxyCheck other = (ProxyCheck) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.domainId, other.domainId) &&
-            java.util.Objects.deepEquals(this.lastRunAt, other.lastRunAt) &&
-            java.util.Objects.deepEquals(this.proxyUrl, other.proxyUrl) &&
-            java.util.Objects.deepEquals(this.successful, other.successful) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.domainId, other.domainId) &&
+            Objects.deepEquals(this.lastRunAt, other.lastRunAt) &&
+            Objects.deepEquals(this.proxyUrl, other.proxyUrl) &&
+            Objects.deepEquals(this.successful, other.successful) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             domainId,
diff --git a/src/main/java/com/clerk/backend_api/models/components/ProxyCheckObject.java b/src/main/java/com/clerk/backend_api/models/components/ProxyCheckObject.java
index c9e2b45..7b149da 100644
--- a/src/main/java/com/clerk/backend_api/models/components/ProxyCheckObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/ProxyCheckObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum ProxyCheckObject {
     PROXY_CHECK("proxy_check");
diff --git a/src/main/java/com/clerk/backend_api/models/components/PublicMetadata.java b/src/main/java/com/clerk/backend_api/models/components/PublicMetadata.java
index 7eac8f7..4bc5c23 100644
--- a/src/main/java/com/clerk/backend_api/models/components/PublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/PublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class PublicMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/PublicUserData.java b/src/main/java/com/clerk/backend_api/models/components/PublicUserData.java
index 2739afb..40c26f4 100644
--- a/src/main/java/com/clerk/backend_api/models/components/PublicUserData.java
+++ b/src/main/java/com/clerk/backend_api/models/components/PublicUserData.java
@@ -4,34 +4,35 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
+import java.lang.Boolean;
 import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class PublicUserData {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("user_id")
-    private Optional<? extends String> userId;
+    private Optional<String> userId;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("first_name")
-    private JsonNullable<? extends String> firstName;
+    private JsonNullable<String> firstName;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("last_name")
-    private JsonNullable<? extends String> lastName;
+    private JsonNullable<String> lastName;
 
     /**
      * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
@@ -39,29 +40,29 @@ public class PublicUserData {
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("profile_image_url")
     @Deprecated
-    private JsonNullable<? extends String> profileImageUrl;
+    private JsonNullable<String> profileImageUrl;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("image_url")
-    private Optional<? extends String> imageUrl;
+    private Optional<String> imageUrl;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("has_image")
-    private Optional<? extends Boolean> hasImage;
+    private Optional<Boolean> hasImage;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("identifier")
-    private JsonNullable<? extends String> identifier;
+    private JsonNullable<String> identifier;
 
     @JsonCreator
     public PublicUserData(
-            @JsonProperty("user_id") Optional<? extends String> userId,
-            @JsonProperty("first_name") JsonNullable<? extends String> firstName,
-            @JsonProperty("last_name") JsonNullable<? extends String> lastName,
-            @JsonProperty("profile_image_url") JsonNullable<? extends String> profileImageUrl,
-            @JsonProperty("image_url") Optional<? extends String> imageUrl,
-            @JsonProperty("has_image") Optional<? extends Boolean> hasImage,
-            @JsonProperty("identifier") JsonNullable<? extends String> identifier) {
+            @JsonProperty("user_id") Optional<String> userId,
+            @JsonProperty("first_name") JsonNullable<String> firstName,
+            @JsonProperty("last_name") JsonNullable<String> lastName,
+            @JsonProperty("profile_image_url") JsonNullable<String> profileImageUrl,
+            @JsonProperty("image_url") Optional<String> imageUrl,
+            @JsonProperty("has_image") Optional<Boolean> hasImage,
+            @JsonProperty("identifier") JsonNullable<String> identifier) {
         Utils.checkNotNull(userId, "userId");
         Utils.checkNotNull(firstName, "firstName");
         Utils.checkNotNull(lastName, "lastName");
@@ -82,50 +83,43 @@ public PublicUserData() {
         this(Optional.empty(), JsonNullable.undefined(), JsonNullable.undefined(), JsonNullable.undefined(), Optional.empty(), Optional.empty(), JsonNullable.undefined());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> userId() {
-        return (Optional<String>) userId;
+        return userId;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> firstName() {
-        return (JsonNullable<String>) firstName;
+        return firstName;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> lastName() {
-        return (JsonNullable<String>) lastName;
+        return lastName;
     }
 
     /**
      * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> profileImageUrl() {
-        return (JsonNullable<String>) profileImageUrl;
+        return profileImageUrl;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> imageUrl() {
-        return (Optional<String>) imageUrl;
+        return imageUrl;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> hasImage() {
-        return (Optional<Boolean>) hasImage;
+        return hasImage;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> identifier() {
-        return (JsonNullable<String>) identifier;
+        return identifier;
     }
 
     public final static Builder builder() {
@@ -138,7 +132,7 @@ public PublicUserData withUserId(String userId) {
         return this;
     }
 
-    public PublicUserData withUserId(Optional<? extends String> userId) {
+    public PublicUserData withUserId(Optional<String> userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
@@ -150,7 +144,7 @@ public PublicUserData withFirstName(String firstName) {
         return this;
     }
 
-    public PublicUserData withFirstName(JsonNullable<? extends String> firstName) {
+    public PublicUserData withFirstName(JsonNullable<String> firstName) {
         Utils.checkNotNull(firstName, "firstName");
         this.firstName = firstName;
         return this;
@@ -162,7 +156,7 @@ public PublicUserData withLastName(String lastName) {
         return this;
     }
 
-    public PublicUserData withLastName(JsonNullable<? extends String> lastName) {
+    public PublicUserData withLastName(JsonNullable<String> lastName) {
         Utils.checkNotNull(lastName, "lastName");
         this.lastName = lastName;
         return this;
@@ -182,7 +176,7 @@ public PublicUserData withProfileImageUrl(String profileImageUrl) {
      * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public PublicUserData withProfileImageUrl(JsonNullable<? extends String> profileImageUrl) {
+    public PublicUserData withProfileImageUrl(JsonNullable<String> profileImageUrl) {
         Utils.checkNotNull(profileImageUrl, "profileImageUrl");
         this.profileImageUrl = profileImageUrl;
         return this;
@@ -194,7 +188,7 @@ public PublicUserData withImageUrl(String imageUrl) {
         return this;
     }
 
-    public PublicUserData withImageUrl(Optional<? extends String> imageUrl) {
+    public PublicUserData withImageUrl(Optional<String> imageUrl) {
         Utils.checkNotNull(imageUrl, "imageUrl");
         this.imageUrl = imageUrl;
         return this;
@@ -206,7 +200,7 @@ public PublicUserData withHasImage(boolean hasImage) {
         return this;
     }
 
-    public PublicUserData withHasImage(Optional<? extends Boolean> hasImage) {
+    public PublicUserData withHasImage(Optional<Boolean> hasImage) {
         Utils.checkNotNull(hasImage, "hasImage");
         this.hasImage = hasImage;
         return this;
@@ -218,7 +212,7 @@ public PublicUserData withIdentifier(String identifier) {
         return this;
     }
 
-    public PublicUserData withIdentifier(JsonNullable<? extends String> identifier) {
+    public PublicUserData withIdentifier(JsonNullable<String> identifier) {
         Utils.checkNotNull(identifier, "identifier");
         this.identifier = identifier;
         return this;
@@ -234,18 +228,18 @@ public boolean equals(java.lang.Object o) {
         }
         PublicUserData other = (PublicUserData) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.firstName, other.firstName) &&
-            java.util.Objects.deepEquals(this.lastName, other.lastName) &&
-            java.util.Objects.deepEquals(this.profileImageUrl, other.profileImageUrl) &&
-            java.util.Objects.deepEquals(this.imageUrl, other.imageUrl) &&
-            java.util.Objects.deepEquals(this.hasImage, other.hasImage) &&
-            java.util.Objects.deepEquals(this.identifier, other.identifier);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.firstName, other.firstName) &&
+            Objects.deepEquals(this.lastName, other.lastName) &&
+            Objects.deepEquals(this.profileImageUrl, other.profileImageUrl) &&
+            Objects.deepEquals(this.imageUrl, other.imageUrl) &&
+            Objects.deepEquals(this.hasImage, other.hasImage) &&
+            Objects.deepEquals(this.identifier, other.identifier);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             firstName,
             lastName,
@@ -269,20 +263,20 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> userId = Optional.empty();
+        private Optional<String> userId = Optional.empty();
  
-        private JsonNullable<? extends String> firstName = JsonNullable.undefined();
+        private JsonNullable<String> firstName = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> lastName = JsonNullable.undefined();
+        private JsonNullable<String> lastName = JsonNullable.undefined();
  
         @Deprecated
-        private JsonNullable<? extends String> profileImageUrl = JsonNullable.undefined();
+        private JsonNullable<String> profileImageUrl = JsonNullable.undefined();
  
-        private Optional<? extends String> imageUrl = Optional.empty();
+        private Optional<String> imageUrl = Optional.empty();
  
-        private Optional<? extends Boolean> hasImage = Optional.empty();
+        private Optional<Boolean> hasImage = Optional.empty();
  
-        private JsonNullable<? extends String> identifier = JsonNullable.undefined();  
+        private JsonNullable<String> identifier = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -294,7 +288,7 @@ public Builder userId(String userId) {
             return this;
         }
 
-        public Builder userId(Optional<? extends String> userId) {
+        public Builder userId(Optional<String> userId) {
             Utils.checkNotNull(userId, "userId");
             this.userId = userId;
             return this;
@@ -306,7 +300,7 @@ public Builder firstName(String firstName) {
             return this;
         }
 
-        public Builder firstName(JsonNullable<? extends String> firstName) {
+        public Builder firstName(JsonNullable<String> firstName) {
             Utils.checkNotNull(firstName, "firstName");
             this.firstName = firstName;
             return this;
@@ -318,7 +312,7 @@ public Builder lastName(String lastName) {
             return this;
         }
 
-        public Builder lastName(JsonNullable<? extends String> lastName) {
+        public Builder lastName(JsonNullable<String> lastName) {
             Utils.checkNotNull(lastName, "lastName");
             this.lastName = lastName;
             return this;
@@ -338,7 +332,7 @@ public Builder profileImageUrl(String profileImageUrl) {
          * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
          */
         @Deprecated
-        public Builder profileImageUrl(JsonNullable<? extends String> profileImageUrl) {
+        public Builder profileImageUrl(JsonNullable<String> profileImageUrl) {
             Utils.checkNotNull(profileImageUrl, "profileImageUrl");
             this.profileImageUrl = profileImageUrl;
             return this;
@@ -350,7 +344,7 @@ public Builder imageUrl(String imageUrl) {
             return this;
         }
 
-        public Builder imageUrl(Optional<? extends String> imageUrl) {
+        public Builder imageUrl(Optional<String> imageUrl) {
             Utils.checkNotNull(imageUrl, "imageUrl");
             this.imageUrl = imageUrl;
             return this;
@@ -362,7 +356,7 @@ public Builder hasImage(boolean hasImage) {
             return this;
         }
 
-        public Builder hasImage(Optional<? extends Boolean> hasImage) {
+        public Builder hasImage(Optional<Boolean> hasImage) {
             Utils.checkNotNull(hasImage, "hasImage");
             this.hasImage = hasImage;
             return this;
@@ -374,7 +368,7 @@ public Builder identifier(String identifier) {
             return this;
         }
 
-        public Builder identifier(JsonNullable<? extends String> identifier) {
+        public Builder identifier(JsonNullable<String> identifier) {
             Utils.checkNotNull(identifier, "identifier");
             this.identifier = identifier;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/RedirectURL.java b/src/main/java/com/clerk/backend_api/models/components/RedirectURL.java
index 61fb831..f2678ed 100644
--- a/src/main/java/com/clerk/backend_api/models/components/RedirectURL.java
+++ b/src/main/java/com/clerk/backend_api/models/components/RedirectURL.java
@@ -4,16 +4,16 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class RedirectURL {
 
@@ -144,16 +144,16 @@ public boolean equals(java.lang.Object o) {
         }
         RedirectURL other = (RedirectURL) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.url, other.url) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.url, other.url) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             url,
diff --git a/src/main/java/com/clerk/backend_api/models/components/RedirectURLObject.java b/src/main/java/com/clerk/backend_api/models/components/RedirectURLObject.java
index 22e99db..4de140c 100644
--- a/src/main/java/com/clerk/backend_api/models/components/RedirectURLObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/RedirectURLObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum RedirectURLObject {
     REDIRECT_URL("redirect_url");
diff --git a/src/main/java/com/clerk/backend_api/models/components/SAMLAccount.java b/src/main/java/com/clerk/backend_api/models/components/SAMLAccount.java
index ed0c9d8..c8136b3 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SAMLAccount.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SAMLAccount.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class SAMLAccount {
 
     @JsonProperty("id")
@@ -42,15 +43,15 @@ public class SAMLAccount {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("first_name")
-    private JsonNullable<? extends String> firstName;
+    private JsonNullable<String> firstName;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("last_name")
-    private JsonNullable<? extends String> lastName;
+    private JsonNullable<String> lastName;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("provider_user_id")
-    private JsonNullable<? extends String> providerUserId;
+    private JsonNullable<String> providerUserId;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("public_metadata")
@@ -67,9 +68,9 @@ public SAMLAccount(
             @JsonProperty("provider") String provider,
             @JsonProperty("active") boolean active,
             @JsonProperty("email_address") String emailAddress,
-            @JsonProperty("first_name") JsonNullable<? extends String> firstName,
-            @JsonProperty("last_name") JsonNullable<? extends String> lastName,
-            @JsonProperty("provider_user_id") JsonNullable<? extends String> providerUserId,
+            @JsonProperty("first_name") JsonNullable<String> firstName,
+            @JsonProperty("last_name") JsonNullable<String> lastName,
+            @JsonProperty("provider_user_id") JsonNullable<String> providerUserId,
             @JsonProperty("public_metadata") Optional<? extends SAMLAccountPublicMetadata> publicMetadata,
             @JsonProperty("verification") Optional<? extends SAMLAccountVerification> verification) {
         Utils.checkNotNull(id, "id");
@@ -132,22 +133,19 @@ public String emailAddress() {
         return emailAddress;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> firstName() {
-        return (JsonNullable<String>) firstName;
+        return firstName;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> lastName() {
-        return (JsonNullable<String>) lastName;
+        return lastName;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> providerUserId() {
-        return (JsonNullable<String>) providerUserId;
+        return providerUserId;
     }
 
     @SuppressWarnings("unchecked")
@@ -206,7 +204,7 @@ public SAMLAccount withFirstName(String firstName) {
         return this;
     }
 
-    public SAMLAccount withFirstName(JsonNullable<? extends String> firstName) {
+    public SAMLAccount withFirstName(JsonNullable<String> firstName) {
         Utils.checkNotNull(firstName, "firstName");
         this.firstName = firstName;
         return this;
@@ -218,7 +216,7 @@ public SAMLAccount withLastName(String lastName) {
         return this;
     }
 
-    public SAMLAccount withLastName(JsonNullable<? extends String> lastName) {
+    public SAMLAccount withLastName(JsonNullable<String> lastName) {
         Utils.checkNotNull(lastName, "lastName");
         this.lastName = lastName;
         return this;
@@ -230,7 +228,7 @@ public SAMLAccount withProviderUserId(String providerUserId) {
         return this;
     }
 
-    public SAMLAccount withProviderUserId(JsonNullable<? extends String> providerUserId) {
+    public SAMLAccount withProviderUserId(JsonNullable<String> providerUserId) {
         Utils.checkNotNull(providerUserId, "providerUserId");
         this.providerUserId = providerUserId;
         return this;
@@ -270,21 +268,21 @@ public boolean equals(java.lang.Object o) {
         }
         SAMLAccount other = (SAMLAccount) o;
         return 
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.provider, other.provider) &&
-            java.util.Objects.deepEquals(this.active, other.active) &&
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.firstName, other.firstName) &&
-            java.util.Objects.deepEquals(this.lastName, other.lastName) &&
-            java.util.Objects.deepEquals(this.providerUserId, other.providerUserId) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.verification, other.verification);
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.provider, other.provider) &&
+            Objects.deepEquals(this.active, other.active) &&
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.firstName, other.firstName) &&
+            Objects.deepEquals(this.lastName, other.lastName) &&
+            Objects.deepEquals(this.providerUserId, other.providerUserId) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.verification, other.verification);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             id,
             object,
             provider,
@@ -324,11 +322,11 @@ public final static class Builder {
  
         private String emailAddress;
  
-        private JsonNullable<? extends String> firstName = JsonNullable.undefined();
+        private JsonNullable<String> firstName = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> lastName = JsonNullable.undefined();
+        private JsonNullable<String> lastName = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> providerUserId = JsonNullable.undefined();
+        private JsonNullable<String> providerUserId = JsonNullable.undefined();
  
         private Optional<? extends SAMLAccountPublicMetadata> publicMetadata = Optional.empty();
  
@@ -378,7 +376,7 @@ public Builder firstName(String firstName) {
             return this;
         }
 
-        public Builder firstName(JsonNullable<? extends String> firstName) {
+        public Builder firstName(JsonNullable<String> firstName) {
             Utils.checkNotNull(firstName, "firstName");
             this.firstName = firstName;
             return this;
@@ -390,7 +388,7 @@ public Builder lastName(String lastName) {
             return this;
         }
 
-        public Builder lastName(JsonNullable<? extends String> lastName) {
+        public Builder lastName(JsonNullable<String> lastName) {
             Utils.checkNotNull(lastName, "lastName");
             this.lastName = lastName;
             return this;
@@ -402,7 +400,7 @@ public Builder providerUserId(String providerUserId) {
             return this;
         }
 
-        public Builder providerUserId(JsonNullable<? extends String> providerUserId) {
+        public Builder providerUserId(JsonNullable<String> providerUserId) {
             Utils.checkNotNull(providerUserId, "providerUserId");
             this.providerUserId = providerUserId;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/SAMLAccountObject.java b/src/main/java/com/clerk/backend_api/models/components/SAMLAccountObject.java
index 627525a..0b0858d 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SAMLAccountObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SAMLAccountObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * SAMLAccountObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/SAMLAccountPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/components/SAMLAccountPublicMetadata.java
index 17545c8..144c51f 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SAMLAccountPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SAMLAccountPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class SAMLAccountPublicMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/SAMLAccountVerification.java b/src/main/java/com/clerk/backend_api/models/components/SAMLAccountVerification.java
index 9da8930..e7c4d43 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SAMLAccountVerification.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SAMLAccountVerification.java
@@ -4,28 +4,25 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
 
-import java.time.OffsetDateTime;
-import java.time.LocalDate;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.clerk.backend_api.utils.OneOfDeserializer;
 import com.clerk.backend_api.utils.TypedObject;
 import com.clerk.backend_api.utils.Utils.JsonShape;
+import com.clerk.backend_api.utils.Utils.TypeReferenceWithShape;
+import com.clerk.backend_api.utils.Utils;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 
 
 @JsonDeserialize(using = SAMLAccountVerification._Deserializer.class)
 public class SAMLAccountVerification {
 
-    @com.fasterxml.jackson.annotation.JsonValue
+    @JsonValue
     private TypedObject value;
     
     private SAMLAccountVerification(TypedObject value) {
@@ -45,8 +42,8 @@ public static SAMLAccountVerification of(Ticket value) {
     /**
      * Returns an instance of one of these types:
      * <ul>
-     * <li>{@code Saml}</li>
-     * <li>{@code Ticket}</li>
+     * <li>{@code com.clerk.backend_api.models.components.Saml}</li>
+     * <li>{@code com.clerk.backend_api.models.components.Ticket}</li>
      * </ul>
      * 
      * <p>Use {@code instanceof} to determine what type is returned. For example:
@@ -73,21 +70,21 @@ public boolean equals(java.lang.Object o) {
             return false;
         }
         SAMLAccountVerification other = (SAMLAccountVerification) o;
-        return java.util.Objects.deepEquals(this.value.value(), other.value.value()); 
+        return Objects.deepEquals(this.value.value(), other.value.value()); 
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(value.value());
+        return Objects.hash(value.value());
     }
     
     @SuppressWarnings("serial")
-    public static final class _Deserializer extends com.clerk.backend_api.utils.OneOfDeserializer<SAMLAccountVerification> {
+    public static final class _Deserializer extends OneOfDeserializer<SAMLAccountVerification> {
 
         public _Deserializer() {
             super(SAMLAccountVerification.class,
-                  Utils.TypeReferenceWithShape.of(new TypeReference<Saml>() {}, Utils.JsonShape.DEFAULT),
-                  Utils.TypeReferenceWithShape.of(new TypeReference<Ticket>() {}, Utils.JsonShape.DEFAULT));
+                  TypeReferenceWithShape.of(new TypeReference<com.clerk.backend_api.models.components.Saml>() {}, JsonShape.DEFAULT),
+                  TypeReferenceWithShape.of(new TypeReference<com.clerk.backend_api.models.components.Ticket>() {}, JsonShape.DEFAULT));
         }
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/SAMLConnection.java b/src/main/java/com/clerk/backend_api/models/components/SAMLConnection.java
index 1cdd9fe..633f754 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SAMLConnection.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SAMLConnection.java
@@ -4,21 +4,23 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class SAMLConnection {
 
     @JsonProperty("object")
@@ -35,23 +37,23 @@ public class SAMLConnection {
 
     @JsonInclude(Include.ALWAYS)
     @JsonProperty("idp_entity_id")
-    private Optional<? extends String> idpEntityId;
+    private Optional<String> idpEntityId;
 
     @JsonInclude(Include.ALWAYS)
     @JsonProperty("idp_sso_url")
-    private Optional<? extends String> idpSsoUrl;
+    private Optional<String> idpSsoUrl;
 
     @JsonInclude(Include.ALWAYS)
     @JsonProperty("idp_certificate")
-    private Optional<? extends String> idpCertificate;
+    private Optional<String> idpCertificate;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("idp_metadata_url")
-    private JsonNullable<? extends String> idpMetadataUrl;
+    private JsonNullable<String> idpMetadataUrl;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("idp_metadata")
-    private JsonNullable<? extends String> idpMetadata;
+    private JsonNullable<String> idpMetadata;
 
     @JsonProperty("acs_url")
     private String acsUrl;
@@ -80,11 +82,11 @@ public class SAMLConnection {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("allow_subdomains")
-    private Optional<? extends Boolean> allowSubdomains;
+    private Optional<Boolean> allowSubdomains;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("allow_idp_initiated")
-    private Optional<? extends Boolean> allowIdpInitiated;
+    private Optional<Boolean> allowIdpInitiated;
 
     /**
      * Unix timestamp of creation.
@@ -106,11 +108,11 @@ public SAMLConnection(
             @JsonProperty("id") String id,
             @JsonProperty("name") String name,
             @JsonProperty("domain") String domain,
-            @JsonProperty("idp_entity_id") Optional<? extends String> idpEntityId,
-            @JsonProperty("idp_sso_url") Optional<? extends String> idpSsoUrl,
-            @JsonProperty("idp_certificate") Optional<? extends String> idpCertificate,
-            @JsonProperty("idp_metadata_url") JsonNullable<? extends String> idpMetadataUrl,
-            @JsonProperty("idp_metadata") JsonNullable<? extends String> idpMetadata,
+            @JsonProperty("idp_entity_id") Optional<String> idpEntityId,
+            @JsonProperty("idp_sso_url") Optional<String> idpSsoUrl,
+            @JsonProperty("idp_certificate") Optional<String> idpCertificate,
+            @JsonProperty("idp_metadata_url") JsonNullable<String> idpMetadataUrl,
+            @JsonProperty("idp_metadata") JsonNullable<String> idpMetadata,
             @JsonProperty("acs_url") String acsUrl,
             @JsonProperty("sp_entity_id") String spEntityId,
             @JsonProperty("sp_metadata_url") String spMetadataUrl,
@@ -119,8 +121,8 @@ public SAMLConnection(
             @JsonProperty("provider") String provider,
             @JsonProperty("user_count") long userCount,
             @JsonProperty("sync_user_attributes") boolean syncUserAttributes,
-            @JsonProperty("allow_subdomains") Optional<? extends Boolean> allowSubdomains,
-            @JsonProperty("allow_idp_initiated") Optional<? extends Boolean> allowIdpInitiated,
+            @JsonProperty("allow_subdomains") Optional<Boolean> allowSubdomains,
+            @JsonProperty("allow_idp_initiated") Optional<Boolean> allowIdpInitiated,
             @JsonProperty("created_at") long createdAt,
             @JsonProperty("updated_at") long updatedAt) {
         Utils.checkNotNull(object, "object");
@@ -204,34 +206,29 @@ public String domain() {
         return domain;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> idpEntityId() {
-        return (Optional<String>) idpEntityId;
+        return idpEntityId;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> idpSsoUrl() {
-        return (Optional<String>) idpSsoUrl;
+        return idpSsoUrl;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> idpCertificate() {
-        return (Optional<String>) idpCertificate;
+        return idpCertificate;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> idpMetadataUrl() {
-        return (JsonNullable<String>) idpMetadataUrl;
+        return idpMetadataUrl;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> idpMetadata() {
-        return (JsonNullable<String>) idpMetadata;
+        return idpMetadata;
     }
 
     @JsonIgnore
@@ -275,16 +272,14 @@ public boolean syncUserAttributes() {
         return syncUserAttributes;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> allowSubdomains() {
-        return (Optional<Boolean>) allowSubdomains;
+        return allowSubdomains;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> allowIdpInitiated() {
-        return (Optional<Boolean>) allowIdpInitiated;
+        return allowIdpInitiated;
     }
 
     /**
@@ -339,7 +334,7 @@ public SAMLConnection withIdpEntityId(String idpEntityId) {
         return this;
     }
 
-    public SAMLConnection withIdpEntityId(Optional<? extends String> idpEntityId) {
+    public SAMLConnection withIdpEntityId(Optional<String> idpEntityId) {
         Utils.checkNotNull(idpEntityId, "idpEntityId");
         this.idpEntityId = idpEntityId;
         return this;
@@ -351,7 +346,7 @@ public SAMLConnection withIdpSsoUrl(String idpSsoUrl) {
         return this;
     }
 
-    public SAMLConnection withIdpSsoUrl(Optional<? extends String> idpSsoUrl) {
+    public SAMLConnection withIdpSsoUrl(Optional<String> idpSsoUrl) {
         Utils.checkNotNull(idpSsoUrl, "idpSsoUrl");
         this.idpSsoUrl = idpSsoUrl;
         return this;
@@ -363,7 +358,7 @@ public SAMLConnection withIdpCertificate(String idpCertificate) {
         return this;
     }
 
-    public SAMLConnection withIdpCertificate(Optional<? extends String> idpCertificate) {
+    public SAMLConnection withIdpCertificate(Optional<String> idpCertificate) {
         Utils.checkNotNull(idpCertificate, "idpCertificate");
         this.idpCertificate = idpCertificate;
         return this;
@@ -375,7 +370,7 @@ public SAMLConnection withIdpMetadataUrl(String idpMetadataUrl) {
         return this;
     }
 
-    public SAMLConnection withIdpMetadataUrl(JsonNullable<? extends String> idpMetadataUrl) {
+    public SAMLConnection withIdpMetadataUrl(JsonNullable<String> idpMetadataUrl) {
         Utils.checkNotNull(idpMetadataUrl, "idpMetadataUrl");
         this.idpMetadataUrl = idpMetadataUrl;
         return this;
@@ -387,7 +382,7 @@ public SAMLConnection withIdpMetadata(String idpMetadata) {
         return this;
     }
 
-    public SAMLConnection withIdpMetadata(JsonNullable<? extends String> idpMetadata) {
+    public SAMLConnection withIdpMetadata(JsonNullable<String> idpMetadata) {
         Utils.checkNotNull(idpMetadata, "idpMetadata");
         this.idpMetadata = idpMetadata;
         return this;
@@ -453,7 +448,7 @@ public SAMLConnection withAllowSubdomains(boolean allowSubdomains) {
         return this;
     }
 
-    public SAMLConnection withAllowSubdomains(Optional<? extends Boolean> allowSubdomains) {
+    public SAMLConnection withAllowSubdomains(Optional<Boolean> allowSubdomains) {
         Utils.checkNotNull(allowSubdomains, "allowSubdomains");
         this.allowSubdomains = allowSubdomains;
         return this;
@@ -465,7 +460,7 @@ public SAMLConnection withAllowIdpInitiated(boolean allowIdpInitiated) {
         return this;
     }
 
-    public SAMLConnection withAllowIdpInitiated(Optional<? extends Boolean> allowIdpInitiated) {
+    public SAMLConnection withAllowIdpInitiated(Optional<Boolean> allowIdpInitiated) {
         Utils.checkNotNull(allowIdpInitiated, "allowIdpInitiated");
         this.allowIdpInitiated = allowIdpInitiated;
         return this;
@@ -501,32 +496,32 @@ public boolean equals(java.lang.Object o) {
         }
         SAMLConnection other = (SAMLConnection) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.domain, other.domain) &&
-            java.util.Objects.deepEquals(this.idpEntityId, other.idpEntityId) &&
-            java.util.Objects.deepEquals(this.idpSsoUrl, other.idpSsoUrl) &&
-            java.util.Objects.deepEquals(this.idpCertificate, other.idpCertificate) &&
-            java.util.Objects.deepEquals(this.idpMetadataUrl, other.idpMetadataUrl) &&
-            java.util.Objects.deepEquals(this.idpMetadata, other.idpMetadata) &&
-            java.util.Objects.deepEquals(this.acsUrl, other.acsUrl) &&
-            java.util.Objects.deepEquals(this.spEntityId, other.spEntityId) &&
-            java.util.Objects.deepEquals(this.spMetadataUrl, other.spMetadataUrl) &&
-            java.util.Objects.deepEquals(this.attributeMapping, other.attributeMapping) &&
-            java.util.Objects.deepEquals(this.active, other.active) &&
-            java.util.Objects.deepEquals(this.provider, other.provider) &&
-            java.util.Objects.deepEquals(this.userCount, other.userCount) &&
-            java.util.Objects.deepEquals(this.syncUserAttributes, other.syncUserAttributes) &&
-            java.util.Objects.deepEquals(this.allowSubdomains, other.allowSubdomains) &&
-            java.util.Objects.deepEquals(this.allowIdpInitiated, other.allowIdpInitiated) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.domain, other.domain) &&
+            Objects.deepEquals(this.idpEntityId, other.idpEntityId) &&
+            Objects.deepEquals(this.idpSsoUrl, other.idpSsoUrl) &&
+            Objects.deepEquals(this.idpCertificate, other.idpCertificate) &&
+            Objects.deepEquals(this.idpMetadataUrl, other.idpMetadataUrl) &&
+            Objects.deepEquals(this.idpMetadata, other.idpMetadata) &&
+            Objects.deepEquals(this.acsUrl, other.acsUrl) &&
+            Objects.deepEquals(this.spEntityId, other.spEntityId) &&
+            Objects.deepEquals(this.spMetadataUrl, other.spMetadataUrl) &&
+            Objects.deepEquals(this.attributeMapping, other.attributeMapping) &&
+            Objects.deepEquals(this.active, other.active) &&
+            Objects.deepEquals(this.provider, other.provider) &&
+            Objects.deepEquals(this.userCount, other.userCount) &&
+            Objects.deepEquals(this.syncUserAttributes, other.syncUserAttributes) &&
+            Objects.deepEquals(this.allowSubdomains, other.allowSubdomains) &&
+            Objects.deepEquals(this.allowIdpInitiated, other.allowIdpInitiated) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             name,
@@ -586,15 +581,15 @@ public final static class Builder {
  
         private String domain;
  
-        private Optional<? extends String> idpEntityId = Optional.empty();
+        private Optional<String> idpEntityId = Optional.empty();
  
-        private Optional<? extends String> idpSsoUrl = Optional.empty();
+        private Optional<String> idpSsoUrl = Optional.empty();
  
-        private Optional<? extends String> idpCertificate = Optional.empty();
+        private Optional<String> idpCertificate = Optional.empty();
  
-        private JsonNullable<? extends String> idpMetadataUrl = JsonNullable.undefined();
+        private JsonNullable<String> idpMetadataUrl = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> idpMetadata = JsonNullable.undefined();
+        private JsonNullable<String> idpMetadata = JsonNullable.undefined();
  
         private String acsUrl;
  
@@ -612,9 +607,9 @@ public final static class Builder {
  
         private Boolean syncUserAttributes;
  
-        private Optional<? extends Boolean> allowSubdomains = Optional.empty();
+        private Optional<Boolean> allowSubdomains = Optional.empty();
  
-        private Optional<? extends Boolean> allowIdpInitiated = Optional.empty();
+        private Optional<Boolean> allowIdpInitiated = Optional.empty();
  
         private Long createdAt;
  
@@ -654,7 +649,7 @@ public Builder idpEntityId(String idpEntityId) {
             return this;
         }
 
-        public Builder idpEntityId(Optional<? extends String> idpEntityId) {
+        public Builder idpEntityId(Optional<String> idpEntityId) {
             Utils.checkNotNull(idpEntityId, "idpEntityId");
             this.idpEntityId = idpEntityId;
             return this;
@@ -666,7 +661,7 @@ public Builder idpSsoUrl(String idpSsoUrl) {
             return this;
         }
 
-        public Builder idpSsoUrl(Optional<? extends String> idpSsoUrl) {
+        public Builder idpSsoUrl(Optional<String> idpSsoUrl) {
             Utils.checkNotNull(idpSsoUrl, "idpSsoUrl");
             this.idpSsoUrl = idpSsoUrl;
             return this;
@@ -678,7 +673,7 @@ public Builder idpCertificate(String idpCertificate) {
             return this;
         }
 
-        public Builder idpCertificate(Optional<? extends String> idpCertificate) {
+        public Builder idpCertificate(Optional<String> idpCertificate) {
             Utils.checkNotNull(idpCertificate, "idpCertificate");
             this.idpCertificate = idpCertificate;
             return this;
@@ -690,7 +685,7 @@ public Builder idpMetadataUrl(String idpMetadataUrl) {
             return this;
         }
 
-        public Builder idpMetadataUrl(JsonNullable<? extends String> idpMetadataUrl) {
+        public Builder idpMetadataUrl(JsonNullable<String> idpMetadataUrl) {
             Utils.checkNotNull(idpMetadataUrl, "idpMetadataUrl");
             this.idpMetadataUrl = idpMetadataUrl;
             return this;
@@ -702,7 +697,7 @@ public Builder idpMetadata(String idpMetadata) {
             return this;
         }
 
-        public Builder idpMetadata(JsonNullable<? extends String> idpMetadata) {
+        public Builder idpMetadata(JsonNullable<String> idpMetadata) {
             Utils.checkNotNull(idpMetadata, "idpMetadata");
             this.idpMetadata = idpMetadata;
             return this;
@@ -768,7 +763,7 @@ public Builder allowSubdomains(boolean allowSubdomains) {
             return this;
         }
 
-        public Builder allowSubdomains(Optional<? extends Boolean> allowSubdomains) {
+        public Builder allowSubdomains(Optional<Boolean> allowSubdomains) {
             Utils.checkNotNull(allowSubdomains, "allowSubdomains");
             this.allowSubdomains = allowSubdomains;
             return this;
@@ -780,7 +775,7 @@ public Builder allowIdpInitiated(boolean allowIdpInitiated) {
             return this;
         }
 
-        public Builder allowIdpInitiated(Optional<? extends Boolean> allowIdpInitiated) {
+        public Builder allowIdpInitiated(Optional<Boolean> allowIdpInitiated) {
             Utils.checkNotNull(allowIdpInitiated, "allowIdpInitiated");
             this.allowIdpInitiated = allowIdpInitiated;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/SAMLConnectionObject.java b/src/main/java/com/clerk/backend_api/models/components/SAMLConnectionObject.java
index 33bd177..3fa28a3 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SAMLConnectionObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SAMLConnectionObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum SAMLConnectionObject {
     SAML_CONNECTION("saml_connection");
diff --git a/src/main/java/com/clerk/backend_api/models/components/SAMLConnections.java b/src/main/java/com/clerk/backend_api/models/components/SAMLConnections.java
index 3b08811..d1eba14 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SAMLConnections.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SAMLConnections.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+
 
 public class SAMLConnections {
 
     @JsonProperty("data")
-    private java.util.List<SAMLConnection> data;
+    private List<SAMLConnection> data;
 
     /**
      * Total number of SAML Connections
@@ -29,7 +30,7 @@ public class SAMLConnections {
 
     @JsonCreator
     public SAMLConnections(
-            @JsonProperty("data") java.util.List<SAMLConnection> data,
+            @JsonProperty("data") List<SAMLConnection> data,
             @JsonProperty("total_count") long totalCount) {
         Utils.checkNotNull(data, "data");
         Utils.checkNotNull(totalCount, "totalCount");
@@ -38,7 +39,7 @@ public SAMLConnections(
     }
 
     @JsonIgnore
-    public java.util.List<SAMLConnection> data() {
+    public List<SAMLConnection> data() {
         return data;
     }
 
@@ -55,7 +56,7 @@ public final static Builder builder() {
         return new Builder();
     }
 
-    public SAMLConnections withData(java.util.List<SAMLConnection> data) {
+    public SAMLConnections withData(List<SAMLConnection> data) {
         Utils.checkNotNull(data, "data");
         this.data = data;
         return this;
@@ -81,13 +82,13 @@ public boolean equals(java.lang.Object o) {
         }
         SAMLConnections other = (SAMLConnections) o;
         return 
-            java.util.Objects.deepEquals(this.data, other.data) &&
-            java.util.Objects.deepEquals(this.totalCount, other.totalCount);
+            Objects.deepEquals(this.data, other.data) &&
+            Objects.deepEquals(this.totalCount, other.totalCount);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             data,
             totalCount);
     }
@@ -101,7 +102,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private java.util.List<SAMLConnection> data;
+        private List<SAMLConnection> data;
  
         private Long totalCount;  
         
@@ -109,7 +110,7 @@ private Builder() {
           // force use of static builder() method
         }
 
-        public Builder data(java.util.List<SAMLConnection> data) {
+        public Builder data(List<SAMLConnection> data) {
             Utils.checkNotNull(data, "data");
             this.data = data;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/SAMLErrorClerkError.java b/src/main/java/com/clerk/backend_api/models/components/SAMLErrorClerkError.java
index 75f5103..5e60dc2 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SAMLErrorClerkError.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SAMLErrorClerkError.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class SAMLErrorClerkError {
 
     @JsonProperty("message")
@@ -35,7 +35,7 @@ public class SAMLErrorClerkError {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("clerk_trace_id")
-    private Optional<? extends String> clerkTraceId;
+    private Optional<String> clerkTraceId;
 
     @JsonCreator
     public SAMLErrorClerkError(
@@ -43,7 +43,7 @@ public SAMLErrorClerkError(
             @JsonProperty("long_message") String longMessage,
             @JsonProperty("code") String code,
             @JsonProperty("meta") Optional<? extends ClerkErrorErrorMeta> meta,
-            @JsonProperty("clerk_trace_id") Optional<? extends String> clerkTraceId) {
+            @JsonProperty("clerk_trace_id") Optional<String> clerkTraceId) {
         Utils.checkNotNull(message, "message");
         Utils.checkNotNull(longMessage, "longMessage");
         Utils.checkNotNull(code, "code");
@@ -84,10 +84,9 @@ public Optional<ClerkErrorErrorMeta> meta() {
         return (Optional<ClerkErrorErrorMeta>) meta;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> clerkTraceId() {
-        return (Optional<String>) clerkTraceId;
+        return clerkTraceId;
     }
 
     public final static Builder builder() {
@@ -130,7 +129,7 @@ public SAMLErrorClerkError withClerkTraceId(String clerkTraceId) {
         return this;
     }
 
-    public SAMLErrorClerkError withClerkTraceId(Optional<? extends String> clerkTraceId) {
+    public SAMLErrorClerkError withClerkTraceId(Optional<String> clerkTraceId) {
         Utils.checkNotNull(clerkTraceId, "clerkTraceId");
         this.clerkTraceId = clerkTraceId;
         return this;
@@ -146,16 +145,16 @@ public boolean equals(java.lang.Object o) {
         }
         SAMLErrorClerkError other = (SAMLErrorClerkError) o;
         return 
-            java.util.Objects.deepEquals(this.message, other.message) &&
-            java.util.Objects.deepEquals(this.longMessage, other.longMessage) &&
-            java.util.Objects.deepEquals(this.code, other.code) &&
-            java.util.Objects.deepEquals(this.meta, other.meta) &&
-            java.util.Objects.deepEquals(this.clerkTraceId, other.clerkTraceId);
+            Objects.deepEquals(this.message, other.message) &&
+            Objects.deepEquals(this.longMessage, other.longMessage) &&
+            Objects.deepEquals(this.code, other.code) &&
+            Objects.deepEquals(this.meta, other.meta) &&
+            Objects.deepEquals(this.clerkTraceId, other.clerkTraceId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             message,
             longMessage,
             code,
@@ -183,7 +182,7 @@ public final static class Builder {
  
         private Optional<? extends ClerkErrorErrorMeta> meta = Optional.empty();
  
-        private Optional<? extends String> clerkTraceId = Optional.empty();  
+        private Optional<String> clerkTraceId = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -225,7 +224,7 @@ public Builder clerkTraceId(String clerkTraceId) {
             return this;
         }
 
-        public Builder clerkTraceId(Optional<? extends String> clerkTraceId) {
+        public Builder clerkTraceId(Optional<String> clerkTraceId) {
             Utils.checkNotNull(clerkTraceId, "clerkTraceId");
             this.clerkTraceId = clerkTraceId;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/SAMLVerificationStatus.java b/src/main/java/com/clerk/backend_api/models/components/SAMLVerificationStatus.java
index 7751ee9..fdefed5 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SAMLVerificationStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SAMLVerificationStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum SAMLVerificationStatus {
     UNVERIFIED("unverified"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/SAMLVerificationStrategy.java b/src/main/java/com/clerk/backend_api/models/components/SAMLVerificationStrategy.java
index c7170c9..1d0bf23 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SAMLVerificationStrategy.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SAMLVerificationStrategy.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum SAMLVerificationStrategy {
     SAML("saml");
diff --git a/src/main/java/com/clerk/backend_api/models/components/Saml.java b/src/main/java/com/clerk/backend_api/models/components/Saml.java
index b7c83e2..a2fa803 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Saml.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Saml.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class Saml {
 
     @JsonProperty("status")
@@ -29,7 +30,7 @@ public class Saml {
 
     @JsonInclude(Include.ALWAYS)
     @JsonProperty("external_verification_redirect_url")
-    private Optional<? extends String> externalVerificationRedirectUrl;
+    private Optional<String> externalVerificationRedirectUrl;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("error")
@@ -40,16 +41,16 @@ public class Saml {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("attempts")
-    private JsonNullable<? extends Long> attempts;
+    private JsonNullable<Long> attempts;
 
     @JsonCreator
     public Saml(
             @JsonProperty("status") SAMLVerificationStatus status,
             @JsonProperty("strategy") SAMLVerificationStrategy strategy,
-            @JsonProperty("external_verification_redirect_url") Optional<? extends String> externalVerificationRedirectUrl,
+            @JsonProperty("external_verification_redirect_url") Optional<String> externalVerificationRedirectUrl,
             @JsonProperty("error") JsonNullable<? extends VerificationError> error,
             @JsonProperty("expire_at") long expireAt,
-            @JsonProperty("attempts") JsonNullable<? extends Long> attempts) {
+            @JsonProperty("attempts") JsonNullable<Long> attempts) {
         Utils.checkNotNull(status, "status");
         Utils.checkNotNull(strategy, "strategy");
         Utils.checkNotNull(externalVerificationRedirectUrl, "externalVerificationRedirectUrl");
@@ -81,10 +82,9 @@ public SAMLVerificationStrategy strategy() {
         return strategy;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> externalVerificationRedirectUrl() {
-        return (Optional<String>) externalVerificationRedirectUrl;
+        return externalVerificationRedirectUrl;
     }
 
     @SuppressWarnings("unchecked")
@@ -98,10 +98,9 @@ public long expireAt() {
         return expireAt;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> attempts() {
-        return (JsonNullable<Long>) attempts;
+        return attempts;
     }
 
     public final static Builder builder() {
@@ -126,7 +125,7 @@ public Saml withExternalVerificationRedirectUrl(String externalVerificationRedir
         return this;
     }
 
-    public Saml withExternalVerificationRedirectUrl(Optional<? extends String> externalVerificationRedirectUrl) {
+    public Saml withExternalVerificationRedirectUrl(Optional<String> externalVerificationRedirectUrl) {
         Utils.checkNotNull(externalVerificationRedirectUrl, "externalVerificationRedirectUrl");
         this.externalVerificationRedirectUrl = externalVerificationRedirectUrl;
         return this;
@@ -156,7 +155,7 @@ public Saml withAttempts(long attempts) {
         return this;
     }
 
-    public Saml withAttempts(JsonNullable<? extends Long> attempts) {
+    public Saml withAttempts(JsonNullable<Long> attempts) {
         Utils.checkNotNull(attempts, "attempts");
         this.attempts = attempts;
         return this;
@@ -172,17 +171,17 @@ public boolean equals(java.lang.Object o) {
         }
         Saml other = (Saml) o;
         return 
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.strategy, other.strategy) &&
-            java.util.Objects.deepEquals(this.externalVerificationRedirectUrl, other.externalVerificationRedirectUrl) &&
-            java.util.Objects.deepEquals(this.error, other.error) &&
-            java.util.Objects.deepEquals(this.expireAt, other.expireAt) &&
-            java.util.Objects.deepEquals(this.attempts, other.attempts);
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.strategy, other.strategy) &&
+            Objects.deepEquals(this.externalVerificationRedirectUrl, other.externalVerificationRedirectUrl) &&
+            Objects.deepEquals(this.error, other.error) &&
+            Objects.deepEquals(this.expireAt, other.expireAt) &&
+            Objects.deepEquals(this.attempts, other.attempts);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             status,
             strategy,
             externalVerificationRedirectUrl,
@@ -208,13 +207,13 @@ public final static class Builder {
  
         private SAMLVerificationStrategy strategy;
  
-        private Optional<? extends String> externalVerificationRedirectUrl = Optional.empty();
+        private Optional<String> externalVerificationRedirectUrl = Optional.empty();
  
         private JsonNullable<? extends VerificationError> error = JsonNullable.undefined();
  
         private Long expireAt;
  
-        private JsonNullable<? extends Long> attempts = JsonNullable.undefined();  
+        private JsonNullable<Long> attempts = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -238,7 +237,7 @@ public Builder externalVerificationRedirectUrl(String externalVerificationRedire
             return this;
         }
 
-        public Builder externalVerificationRedirectUrl(Optional<? extends String> externalVerificationRedirectUrl) {
+        public Builder externalVerificationRedirectUrl(Optional<String> externalVerificationRedirectUrl) {
             Utils.checkNotNull(externalVerificationRedirectUrl, "externalVerificationRedirectUrl");
             this.externalVerificationRedirectUrl = externalVerificationRedirectUrl;
             return this;
@@ -268,7 +267,7 @@ public Builder attempts(long attempts) {
             return this;
         }
 
-        public Builder attempts(JsonNullable<? extends Long> attempts) {
+        public Builder attempts(JsonNullable<Long> attempts) {
             Utils.checkNotNull(attempts, "attempts");
             this.attempts = attempts;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/SchemasPasskey.java b/src/main/java/com/clerk/backend_api/models/components/SchemasPasskey.java
index 5e522a3..9e4fb24 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SchemasPasskey.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SchemasPasskey.java
@@ -4,25 +4,26 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class SchemasPasskey {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("id")
-    private Optional<? extends String> id;
+    private Optional<String> id;
 
     /**
      * String representing the object's type. Objects of the same type share the same value.
@@ -47,7 +48,7 @@ public class SchemasPasskey {
 
     @JsonCreator
     public SchemasPasskey(
-            @JsonProperty("id") Optional<? extends String> id,
+            @JsonProperty("id") Optional<String> id,
             @JsonProperty("object") SchemasPasskeyObject object,
             @JsonProperty("name") String name,
             @JsonProperty("last_used_at") long lastUsedAt,
@@ -71,10 +72,9 @@ public SchemasPasskey(
         this(Optional.empty(), object, name, lastUsedAt, Optional.empty());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> id() {
-        return (Optional<String>) id;
+        return id;
     }
 
     /**
@@ -116,7 +116,7 @@ public SchemasPasskey withId(String id) {
         return this;
     }
 
-    public SchemasPasskey withId(Optional<? extends String> id) {
+    public SchemasPasskey withId(Optional<String> id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
@@ -170,16 +170,16 @@ public boolean equals(java.lang.Object o) {
         }
         SchemasPasskey other = (SchemasPasskey) o;
         return 
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.lastUsedAt, other.lastUsedAt) &&
-            java.util.Objects.deepEquals(this.verification, other.verification);
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.lastUsedAt, other.lastUsedAt) &&
+            Objects.deepEquals(this.verification, other.verification);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             id,
             object,
             name,
@@ -199,7 +199,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> id = Optional.empty();
+        private Optional<String> id = Optional.empty();
  
         private SchemasPasskeyObject object;
  
@@ -219,7 +219,7 @@ public Builder id(String id) {
             return this;
         }
 
-        public Builder id(Optional<? extends String> id) {
+        public Builder id(Optional<String> id) {
             Utils.checkNotNull(id, "id");
             this.id = id;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/SchemasPasskeyObject.java b/src/main/java/com/clerk/backend_api/models/components/SchemasPasskeyObject.java
index 0f3d18e..fb221bb 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SchemasPasskeyObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SchemasPasskeyObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * SchemasPasskeyObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/SchemasPasskeyVerification.java b/src/main/java/com/clerk/backend_api/models/components/SchemasPasskeyVerification.java
index 1263102..44e4dfb 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SchemasPasskeyVerification.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SchemasPasskeyVerification.java
@@ -4,28 +4,25 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
 
-import java.time.OffsetDateTime;
-import java.time.LocalDate;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.clerk.backend_api.utils.OneOfDeserializer;
 import com.clerk.backend_api.utils.TypedObject;
 import com.clerk.backend_api.utils.Utils.JsonShape;
+import com.clerk.backend_api.utils.Utils.TypeReferenceWithShape;
+import com.clerk.backend_api.utils.Utils;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 
 
 @JsonDeserialize(using = SchemasPasskeyVerification._Deserializer.class)
 public class SchemasPasskeyVerification {
 
-    @com.fasterxml.jackson.annotation.JsonValue
+    @JsonValue
     private TypedObject value;
     
     private SchemasPasskeyVerification(TypedObject value) {
@@ -40,7 +37,7 @@ public static SchemasPasskeyVerification of(Passkey value) {
     /**
      * Returns an instance of one of these types:
      * <ul>
-     * <li>{@code Passkey}</li>
+     * <li>{@code com.clerk.backend_api.models.components.Passkey}</li>
      * </ul>
      * 
      * <p>Use {@code instanceof} to determine what type is returned. For example:
@@ -67,20 +64,20 @@ public boolean equals(java.lang.Object o) {
             return false;
         }
         SchemasPasskeyVerification other = (SchemasPasskeyVerification) o;
-        return java.util.Objects.deepEquals(this.value.value(), other.value.value()); 
+        return Objects.deepEquals(this.value.value(), other.value.value()); 
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(value.value());
+        return Objects.hash(value.value());
     }
     
     @SuppressWarnings("serial")
-    public static final class _Deserializer extends com.clerk.backend_api.utils.OneOfDeserializer<SchemasPasskeyVerification> {
+    public static final class _Deserializer extends OneOfDeserializer<SchemasPasskeyVerification> {
 
         public _Deserializer() {
             super(SchemasPasskeyVerification.class,
-                  Utils.TypeReferenceWithShape.of(new TypeReference<Passkey>() {}, Utils.JsonShape.DEFAULT));
+                  TypeReferenceWithShape.of(new TypeReference<com.clerk.backend_api.models.components.Passkey>() {}, JsonShape.DEFAULT));
         }
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/Security.java b/src/main/java/com/clerk/backend_api/models/components/Security.java
index b2376a5..a8ba928 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Security.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Security.java
@@ -4,26 +4,25 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class Security {
 
     @SpeakeasyMetadata("security:scheme=true,type=http,subtype=bearer,name=Authorization")
-    private Optional<? extends String> bearerAuth;
+    private Optional<String> bearerAuth;
 
     @JsonCreator
     public Security(
-            Optional<? extends String> bearerAuth) {
+            Optional<String> bearerAuth) {
         Utils.checkNotNull(bearerAuth, "bearerAuth");
         this.bearerAuth = bearerAuth;
     }
@@ -32,10 +31,9 @@ public Security() {
         this(Optional.empty());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> bearerAuth() {
-        return (Optional<String>) bearerAuth;
+        return bearerAuth;
     }
 
     public final static Builder builder() {
@@ -48,7 +46,7 @@ public Security withBearerAuth(String bearerAuth) {
         return this;
     }
 
-    public Security withBearerAuth(Optional<? extends String> bearerAuth) {
+    public Security withBearerAuth(Optional<String> bearerAuth) {
         Utils.checkNotNull(bearerAuth, "bearerAuth");
         this.bearerAuth = bearerAuth;
         return this;
@@ -64,12 +62,12 @@ public boolean equals(java.lang.Object o) {
         }
         Security other = (Security) o;
         return 
-            java.util.Objects.deepEquals(this.bearerAuth, other.bearerAuth);
+            Objects.deepEquals(this.bearerAuth, other.bearerAuth);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             bearerAuth);
     }
     
@@ -81,7 +79,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> bearerAuth = Optional.empty();  
+        private Optional<String> bearerAuth = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -93,7 +91,7 @@ public Builder bearerAuth(String bearerAuth) {
             return this;
         }
 
-        public Builder bearerAuth(Optional<? extends String> bearerAuth) {
+        public Builder bearerAuth(Optional<String> bearerAuth) {
             Utils.checkNotNull(bearerAuth, "bearerAuth");
             this.bearerAuth = bearerAuth;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/Session.java b/src/main/java/com/clerk/backend_api/models/components/Session.java
index 7f77e26..526d67a 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Session.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Session.java
@@ -4,20 +4,21 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class Session {
 
     /**
@@ -45,7 +46,7 @@ public class Session {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("last_active_organization_id")
-    private JsonNullable<? extends String> lastActiveOrganizationId;
+    private JsonNullable<String> lastActiveOrganizationId;
 
     @JsonProperty("last_active_at")
     private long lastActiveAt;
@@ -78,7 +79,7 @@ public Session(
             @JsonProperty("client_id") String clientId,
             @JsonProperty("actor") JsonNullable<? extends Actor> actor,
             @JsonProperty("status") Status status,
-            @JsonProperty("last_active_organization_id") JsonNullable<? extends String> lastActiveOrganizationId,
+            @JsonProperty("last_active_organization_id") JsonNullable<String> lastActiveOrganizationId,
             @JsonProperty("last_active_at") long lastActiveAt,
             @JsonProperty("expire_at") long expireAt,
             @JsonProperty("abandon_at") long abandonAt,
@@ -159,10 +160,9 @@ public Status status() {
         return status;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> lastActiveOrganizationId() {
-        return (JsonNullable<String>) lastActiveOrganizationId;
+        return lastActiveOrganizationId;
     }
 
     @JsonIgnore
@@ -254,7 +254,7 @@ public Session withLastActiveOrganizationId(String lastActiveOrganizationId) {
         return this;
     }
 
-    public Session withLastActiveOrganizationId(JsonNullable<? extends String> lastActiveOrganizationId) {
+    public Session withLastActiveOrganizationId(JsonNullable<String> lastActiveOrganizationId) {
         Utils.checkNotNull(lastActiveOrganizationId, "lastActiveOrganizationId");
         this.lastActiveOrganizationId = lastActiveOrganizationId;
         return this;
@@ -308,23 +308,23 @@ public boolean equals(java.lang.Object o) {
         }
         Session other = (Session) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.clientId, other.clientId) &&
-            java.util.Objects.deepEquals(this.actor, other.actor) &&
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.lastActiveOrganizationId, other.lastActiveOrganizationId) &&
-            java.util.Objects.deepEquals(this.lastActiveAt, other.lastActiveAt) &&
-            java.util.Objects.deepEquals(this.expireAt, other.expireAt) &&
-            java.util.Objects.deepEquals(this.abandonAt, other.abandonAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.clientId, other.clientId) &&
+            Objects.deepEquals(this.actor, other.actor) &&
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.lastActiveOrganizationId, other.lastActiveOrganizationId) &&
+            Objects.deepEquals(this.lastActiveAt, other.lastActiveAt) &&
+            Objects.deepEquals(this.expireAt, other.expireAt) &&
+            Objects.deepEquals(this.abandonAt, other.abandonAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt) &&
+            Objects.deepEquals(this.createdAt, other.createdAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             userId,
@@ -370,7 +370,7 @@ public final static class Builder {
  
         private Status status;
  
-        private JsonNullable<? extends String> lastActiveOrganizationId = JsonNullable.undefined();
+        private JsonNullable<String> lastActiveOrganizationId = JsonNullable.undefined();
  
         private Long lastActiveAt;
  
@@ -438,7 +438,7 @@ public Builder lastActiveOrganizationId(String lastActiveOrganizationId) {
             return this;
         }
 
-        public Builder lastActiveOrganizationId(JsonNullable<? extends String> lastActiveOrganizationId) {
+        public Builder lastActiveOrganizationId(JsonNullable<String> lastActiveOrganizationId) {
             Utils.checkNotNull(lastActiveOrganizationId, "lastActiveOrganizationId");
             this.lastActiveOrganizationId = lastActiveOrganizationId;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/SessionObject.java b/src/main/java/com/clerk/backend_api/models/components/SessionObject.java
index 4ef3278..36f0801 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SessionObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SessionObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * SessionObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/SignInToken.java b/src/main/java/com/clerk/backend_api/models/components/SignInToken.java
index 55ba7d4..d4569d9 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SignInToken.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SignInToken.java
@@ -4,21 +4,21 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class SignInToken {
 
     @JsonProperty("object")
@@ -35,11 +35,11 @@ public class SignInToken {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("token")
-    private Optional<? extends String> token;
+    private Optional<String> token;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("url")
-    private JsonNullable<? extends String> url;
+    private JsonNullable<String> url;
 
     /**
      * Unix timestamp of creation.
@@ -61,8 +61,8 @@ public SignInToken(
             @JsonProperty("id") String id,
             @JsonProperty("status") SignInTokenStatus status,
             @JsonProperty("user_id") String userId,
-            @JsonProperty("token") Optional<? extends String> token,
-            @JsonProperty("url") JsonNullable<? extends String> url,
+            @JsonProperty("token") Optional<String> token,
+            @JsonProperty("url") JsonNullable<String> url,
             @JsonProperty("created_at") long createdAt,
             @JsonProperty("updated_at") long updatedAt) {
         Utils.checkNotNull(object, "object");
@@ -113,16 +113,14 @@ public String userId() {
         return userId;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> token() {
-        return (Optional<String>) token;
+        return token;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> url() {
-        return (JsonNullable<String>) url;
+        return url;
     }
 
     /**
@@ -177,7 +175,7 @@ public SignInToken withToken(String token) {
         return this;
     }
 
-    public SignInToken withToken(Optional<? extends String> token) {
+    public SignInToken withToken(Optional<String> token) {
         Utils.checkNotNull(token, "token");
         this.token = token;
         return this;
@@ -189,7 +187,7 @@ public SignInToken withUrl(String url) {
         return this;
     }
 
-    public SignInToken withUrl(JsonNullable<? extends String> url) {
+    public SignInToken withUrl(JsonNullable<String> url) {
         Utils.checkNotNull(url, "url");
         this.url = url;
         return this;
@@ -225,19 +223,19 @@ public boolean equals(java.lang.Object o) {
         }
         SignInToken other = (SignInToken) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.token, other.token) &&
-            java.util.Objects.deepEquals(this.url, other.url) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.token, other.token) &&
+            Objects.deepEquals(this.url, other.url) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             status,
@@ -271,9 +269,9 @@ public final static class Builder {
  
         private String userId;
  
-        private Optional<? extends String> token = Optional.empty();
+        private Optional<String> token = Optional.empty();
  
-        private JsonNullable<? extends String> url = JsonNullable.undefined();
+        private JsonNullable<String> url = JsonNullable.undefined();
  
         private Long createdAt;
  
@@ -313,7 +311,7 @@ public Builder token(String token) {
             return this;
         }
 
-        public Builder token(Optional<? extends String> token) {
+        public Builder token(Optional<String> token) {
             Utils.checkNotNull(token, "token");
             this.token = token;
             return this;
@@ -325,7 +323,7 @@ public Builder url(String url) {
             return this;
         }
 
-        public Builder url(JsonNullable<? extends String> url) {
+        public Builder url(JsonNullable<String> url) {
             Utils.checkNotNull(url, "url");
             this.url = url;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/SignInTokenObject.java b/src/main/java/com/clerk/backend_api/models/components/SignInTokenObject.java
index 6dc0c52..4e71547 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SignInTokenObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SignInTokenObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum SignInTokenObject {
     SIGN_IN_TOKEN("sign_in_token");
diff --git a/src/main/java/com/clerk/backend_api/models/components/SignInTokenStatus.java b/src/main/java/com/clerk/backend_api/models/components/SignInTokenStatus.java
index 73adfce..2cbb2eb 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SignInTokenStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SignInTokenStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum SignInTokenStatus {
     PENDING("pending"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/SignUp.java b/src/main/java/com/clerk/backend_api/models/components/SignUp.java
index 0b0f7e3..39eb429 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SignUp.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SignUp.java
@@ -4,21 +4,24 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class SignUp {
 
     @JsonProperty("object")
@@ -32,19 +35,19 @@ public class SignUp {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("required_fields")
-    private Optional<? extends java.util.List<String>> requiredFields;
+    private Optional<? extends List<String>> requiredFields;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("optional_fields")
-    private Optional<? extends java.util.List<String>> optionalFields;
+    private Optional<? extends List<String>> optionalFields;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("missing_fields")
-    private Optional<? extends java.util.List<String>> missingFields;
+    private Optional<? extends List<String>> missingFields;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("unverified_fields")
-    private Optional<? extends java.util.List<String>> unverifiedFields;
+    private Optional<? extends List<String>> unverifiedFields;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("verifications")
@@ -52,30 +55,30 @@ public class SignUp {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("username")
-    private JsonNullable<? extends String> username;
+    private JsonNullable<String> username;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("email_address")
-    private JsonNullable<? extends String> emailAddress;
+    private JsonNullable<String> emailAddress;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("phone_number")
-    private JsonNullable<? extends String> phoneNumber;
+    private JsonNullable<String> phoneNumber;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("web3_wallet")
-    private JsonNullable<? extends String> web3Wallet;
+    private JsonNullable<String> web3Wallet;
 
     @JsonProperty("password_enabled")
     private boolean passwordEnabled;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("first_name")
-    private JsonNullable<? extends String> firstName;
+    private JsonNullable<String> firstName;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("last_name")
-    private JsonNullable<? extends String> lastName;
+    private JsonNullable<String> lastName;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("unsafe_metadata")
@@ -90,15 +93,15 @@ public class SignUp {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("external_id")
-    private JsonNullable<? extends String> externalId;
+    private JsonNullable<String> externalId;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("created_session_id")
-    private JsonNullable<? extends String> createdSessionId;
+    private JsonNullable<String> createdSessionId;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("created_user_id")
-    private JsonNullable<? extends String> createdUserId;
+    private JsonNullable<String> createdUserId;
 
     @JsonProperty("abandon_at")
     private long abandonAt;
@@ -112,24 +115,24 @@ public SignUp(
             @JsonProperty("object") SignUpObject object,
             @JsonProperty("id") String id,
             @JsonProperty("status") SignUpStatus status,
-            @JsonProperty("required_fields") Optional<? extends java.util.List<String>> requiredFields,
-            @JsonProperty("optional_fields") Optional<? extends java.util.List<String>> optionalFields,
-            @JsonProperty("missing_fields") Optional<? extends java.util.List<String>> missingFields,
-            @JsonProperty("unverified_fields") Optional<? extends java.util.List<String>> unverifiedFields,
+            @JsonProperty("required_fields") Optional<? extends List<String>> requiredFields,
+            @JsonProperty("optional_fields") Optional<? extends List<String>> optionalFields,
+            @JsonProperty("missing_fields") Optional<? extends List<String>> missingFields,
+            @JsonProperty("unverified_fields") Optional<? extends List<String>> unverifiedFields,
             @JsonProperty("verifications") Optional<? extends Verifications> verifications,
-            @JsonProperty("username") JsonNullable<? extends String> username,
-            @JsonProperty("email_address") JsonNullable<? extends String> emailAddress,
-            @JsonProperty("phone_number") JsonNullable<? extends String> phoneNumber,
-            @JsonProperty("web3_wallet") JsonNullable<? extends String> web3Wallet,
+            @JsonProperty("username") JsonNullable<String> username,
+            @JsonProperty("email_address") JsonNullable<String> emailAddress,
+            @JsonProperty("phone_number") JsonNullable<String> phoneNumber,
+            @JsonProperty("web3_wallet") JsonNullable<String> web3Wallet,
             @JsonProperty("password_enabled") boolean passwordEnabled,
-            @JsonProperty("first_name") JsonNullable<? extends String> firstName,
-            @JsonProperty("last_name") JsonNullable<? extends String> lastName,
+            @JsonProperty("first_name") JsonNullable<String> firstName,
+            @JsonProperty("last_name") JsonNullable<String> lastName,
             @JsonProperty("unsafe_metadata") Optional<? extends SignUpUnsafeMetadata> unsafeMetadata,
             @JsonProperty("public_metadata") Optional<? extends SignUpPublicMetadata> publicMetadata,
             @JsonProperty("custom_action") boolean customAction,
-            @JsonProperty("external_id") JsonNullable<? extends String> externalId,
-            @JsonProperty("created_session_id") JsonNullable<? extends String> createdSessionId,
-            @JsonProperty("created_user_id") JsonNullable<? extends String> createdUserId,
+            @JsonProperty("external_id") JsonNullable<String> externalId,
+            @JsonProperty("created_session_id") JsonNullable<String> createdSessionId,
+            @JsonProperty("created_user_id") JsonNullable<String> createdUserId,
             @JsonProperty("abandon_at") long abandonAt,
             @JsonProperty("external_account") Optional<? extends ExternalAccount> externalAccount) {
         Utils.checkNotNull(object, "object");
@@ -207,26 +210,26 @@ public SignUpStatus status() {
 
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> requiredFields() {
-        return (Optional<java.util.List<String>>) requiredFields;
+    public Optional<List<String>> requiredFields() {
+        return (Optional<List<String>>) requiredFields;
     }
 
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> optionalFields() {
-        return (Optional<java.util.List<String>>) optionalFields;
+    public Optional<List<String>> optionalFields() {
+        return (Optional<List<String>>) optionalFields;
     }
 
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> missingFields() {
-        return (Optional<java.util.List<String>>) missingFields;
+    public Optional<List<String>> missingFields() {
+        return (Optional<List<String>>) missingFields;
     }
 
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> unverifiedFields() {
-        return (Optional<java.util.List<String>>) unverifiedFields;
+    public Optional<List<String>> unverifiedFields() {
+        return (Optional<List<String>>) unverifiedFields;
     }
 
     @SuppressWarnings("unchecked")
@@ -235,28 +238,24 @@ public Optional<Verifications> verifications() {
         return (Optional<Verifications>) verifications;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> username() {
-        return (JsonNullable<String>) username;
+        return username;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> emailAddress() {
-        return (JsonNullable<String>) emailAddress;
+        return emailAddress;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> phoneNumber() {
-        return (JsonNullable<String>) phoneNumber;
+        return phoneNumber;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> web3Wallet() {
-        return (JsonNullable<String>) web3Wallet;
+        return web3Wallet;
     }
 
     @JsonIgnore
@@ -264,16 +263,14 @@ public boolean passwordEnabled() {
         return passwordEnabled;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> firstName() {
-        return (JsonNullable<String>) firstName;
+        return firstName;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> lastName() {
-        return (JsonNullable<String>) lastName;
+        return lastName;
     }
 
     @SuppressWarnings("unchecked")
@@ -293,22 +290,19 @@ public boolean customAction() {
         return customAction;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> externalId() {
-        return (JsonNullable<String>) externalId;
+        return externalId;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> createdSessionId() {
-        return (JsonNullable<String>) createdSessionId;
+        return createdSessionId;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> createdUserId() {
-        return (JsonNullable<String>) createdUserId;
+        return createdUserId;
     }
 
     @JsonIgnore
@@ -344,49 +338,49 @@ public SignUp withStatus(SignUpStatus status) {
         return this;
     }
 
-    public SignUp withRequiredFields(java.util.List<String> requiredFields) {
+    public SignUp withRequiredFields(List<String> requiredFields) {
         Utils.checkNotNull(requiredFields, "requiredFields");
         this.requiredFields = Optional.ofNullable(requiredFields);
         return this;
     }
 
-    public SignUp withRequiredFields(Optional<? extends java.util.List<String>> requiredFields) {
+    public SignUp withRequiredFields(Optional<? extends List<String>> requiredFields) {
         Utils.checkNotNull(requiredFields, "requiredFields");
         this.requiredFields = requiredFields;
         return this;
     }
 
-    public SignUp withOptionalFields(java.util.List<String> optionalFields) {
+    public SignUp withOptionalFields(List<String> optionalFields) {
         Utils.checkNotNull(optionalFields, "optionalFields");
         this.optionalFields = Optional.ofNullable(optionalFields);
         return this;
     }
 
-    public SignUp withOptionalFields(Optional<? extends java.util.List<String>> optionalFields) {
+    public SignUp withOptionalFields(Optional<? extends List<String>> optionalFields) {
         Utils.checkNotNull(optionalFields, "optionalFields");
         this.optionalFields = optionalFields;
         return this;
     }
 
-    public SignUp withMissingFields(java.util.List<String> missingFields) {
+    public SignUp withMissingFields(List<String> missingFields) {
         Utils.checkNotNull(missingFields, "missingFields");
         this.missingFields = Optional.ofNullable(missingFields);
         return this;
     }
 
-    public SignUp withMissingFields(Optional<? extends java.util.List<String>> missingFields) {
+    public SignUp withMissingFields(Optional<? extends List<String>> missingFields) {
         Utils.checkNotNull(missingFields, "missingFields");
         this.missingFields = missingFields;
         return this;
     }
 
-    public SignUp withUnverifiedFields(java.util.List<String> unverifiedFields) {
+    public SignUp withUnverifiedFields(List<String> unverifiedFields) {
         Utils.checkNotNull(unverifiedFields, "unverifiedFields");
         this.unverifiedFields = Optional.ofNullable(unverifiedFields);
         return this;
     }
 
-    public SignUp withUnverifiedFields(Optional<? extends java.util.List<String>> unverifiedFields) {
+    public SignUp withUnverifiedFields(Optional<? extends List<String>> unverifiedFields) {
         Utils.checkNotNull(unverifiedFields, "unverifiedFields");
         this.unverifiedFields = unverifiedFields;
         return this;
@@ -410,7 +404,7 @@ public SignUp withUsername(String username) {
         return this;
     }
 
-    public SignUp withUsername(JsonNullable<? extends String> username) {
+    public SignUp withUsername(JsonNullable<String> username) {
         Utils.checkNotNull(username, "username");
         this.username = username;
         return this;
@@ -422,7 +416,7 @@ public SignUp withEmailAddress(String emailAddress) {
         return this;
     }
 
-    public SignUp withEmailAddress(JsonNullable<? extends String> emailAddress) {
+    public SignUp withEmailAddress(JsonNullable<String> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = emailAddress;
         return this;
@@ -434,7 +428,7 @@ public SignUp withPhoneNumber(String phoneNumber) {
         return this;
     }
 
-    public SignUp withPhoneNumber(JsonNullable<? extends String> phoneNumber) {
+    public SignUp withPhoneNumber(JsonNullable<String> phoneNumber) {
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         this.phoneNumber = phoneNumber;
         return this;
@@ -446,7 +440,7 @@ public SignUp withWeb3Wallet(String web3Wallet) {
         return this;
     }
 
-    public SignUp withWeb3Wallet(JsonNullable<? extends String> web3Wallet) {
+    public SignUp withWeb3Wallet(JsonNullable<String> web3Wallet) {
         Utils.checkNotNull(web3Wallet, "web3Wallet");
         this.web3Wallet = web3Wallet;
         return this;
@@ -464,7 +458,7 @@ public SignUp withFirstName(String firstName) {
         return this;
     }
 
-    public SignUp withFirstName(JsonNullable<? extends String> firstName) {
+    public SignUp withFirstName(JsonNullable<String> firstName) {
         Utils.checkNotNull(firstName, "firstName");
         this.firstName = firstName;
         return this;
@@ -476,7 +470,7 @@ public SignUp withLastName(String lastName) {
         return this;
     }
 
-    public SignUp withLastName(JsonNullable<? extends String> lastName) {
+    public SignUp withLastName(JsonNullable<String> lastName) {
         Utils.checkNotNull(lastName, "lastName");
         this.lastName = lastName;
         return this;
@@ -518,7 +512,7 @@ public SignUp withExternalId(String externalId) {
         return this;
     }
 
-    public SignUp withExternalId(JsonNullable<? extends String> externalId) {
+    public SignUp withExternalId(JsonNullable<String> externalId) {
         Utils.checkNotNull(externalId, "externalId");
         this.externalId = externalId;
         return this;
@@ -530,7 +524,7 @@ public SignUp withCreatedSessionId(String createdSessionId) {
         return this;
     }
 
-    public SignUp withCreatedSessionId(JsonNullable<? extends String> createdSessionId) {
+    public SignUp withCreatedSessionId(JsonNullable<String> createdSessionId) {
         Utils.checkNotNull(createdSessionId, "createdSessionId");
         this.createdSessionId = createdSessionId;
         return this;
@@ -542,7 +536,7 @@ public SignUp withCreatedUserId(String createdUserId) {
         return this;
     }
 
-    public SignUp withCreatedUserId(JsonNullable<? extends String> createdUserId) {
+    public SignUp withCreatedUserId(JsonNullable<String> createdUserId) {
         Utils.checkNotNull(createdUserId, "createdUserId");
         this.createdUserId = createdUserId;
         return this;
@@ -576,34 +570,34 @@ public boolean equals(java.lang.Object o) {
         }
         SignUp other = (SignUp) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.requiredFields, other.requiredFields) &&
-            java.util.Objects.deepEquals(this.optionalFields, other.optionalFields) &&
-            java.util.Objects.deepEquals(this.missingFields, other.missingFields) &&
-            java.util.Objects.deepEquals(this.unverifiedFields, other.unverifiedFields) &&
-            java.util.Objects.deepEquals(this.verifications, other.verifications) &&
-            java.util.Objects.deepEquals(this.username, other.username) &&
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.phoneNumber, other.phoneNumber) &&
-            java.util.Objects.deepEquals(this.web3Wallet, other.web3Wallet) &&
-            java.util.Objects.deepEquals(this.passwordEnabled, other.passwordEnabled) &&
-            java.util.Objects.deepEquals(this.firstName, other.firstName) &&
-            java.util.Objects.deepEquals(this.lastName, other.lastName) &&
-            java.util.Objects.deepEquals(this.unsafeMetadata, other.unsafeMetadata) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.customAction, other.customAction) &&
-            java.util.Objects.deepEquals(this.externalId, other.externalId) &&
-            java.util.Objects.deepEquals(this.createdSessionId, other.createdSessionId) &&
-            java.util.Objects.deepEquals(this.createdUserId, other.createdUserId) &&
-            java.util.Objects.deepEquals(this.abandonAt, other.abandonAt) &&
-            java.util.Objects.deepEquals(this.externalAccount, other.externalAccount);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.requiredFields, other.requiredFields) &&
+            Objects.deepEquals(this.optionalFields, other.optionalFields) &&
+            Objects.deepEquals(this.missingFields, other.missingFields) &&
+            Objects.deepEquals(this.unverifiedFields, other.unverifiedFields) &&
+            Objects.deepEquals(this.verifications, other.verifications) &&
+            Objects.deepEquals(this.username, other.username) &&
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.phoneNumber, other.phoneNumber) &&
+            Objects.deepEquals(this.web3Wallet, other.web3Wallet) &&
+            Objects.deepEquals(this.passwordEnabled, other.passwordEnabled) &&
+            Objects.deepEquals(this.firstName, other.firstName) &&
+            Objects.deepEquals(this.lastName, other.lastName) &&
+            Objects.deepEquals(this.unsafeMetadata, other.unsafeMetadata) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.customAction, other.customAction) &&
+            Objects.deepEquals(this.externalId, other.externalId) &&
+            Objects.deepEquals(this.createdSessionId, other.createdSessionId) &&
+            Objects.deepEquals(this.createdUserId, other.createdUserId) &&
+            Objects.deepEquals(this.abandonAt, other.abandonAt) &&
+            Objects.deepEquals(this.externalAccount, other.externalAccount);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             id,
             status,
@@ -665,29 +659,29 @@ public final static class Builder {
  
         private SignUpStatus status;
  
-        private Optional<? extends java.util.List<String>> requiredFields = Optional.empty();
+        private Optional<? extends List<String>> requiredFields = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> optionalFields = Optional.empty();
+        private Optional<? extends List<String>> optionalFields = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> missingFields = Optional.empty();
+        private Optional<? extends List<String>> missingFields = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> unverifiedFields = Optional.empty();
+        private Optional<? extends List<String>> unverifiedFields = Optional.empty();
  
         private Optional<? extends Verifications> verifications = Optional.empty();
  
-        private JsonNullable<? extends String> username = JsonNullable.undefined();
+        private JsonNullable<String> username = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> emailAddress = JsonNullable.undefined();
+        private JsonNullable<String> emailAddress = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> phoneNumber = JsonNullable.undefined();
+        private JsonNullable<String> phoneNumber = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> web3Wallet = JsonNullable.undefined();
+        private JsonNullable<String> web3Wallet = JsonNullable.undefined();
  
         private Boolean passwordEnabled;
  
-        private JsonNullable<? extends String> firstName = JsonNullable.undefined();
+        private JsonNullable<String> firstName = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> lastName = JsonNullable.undefined();
+        private JsonNullable<String> lastName = JsonNullable.undefined();
  
         private Optional<? extends SignUpUnsafeMetadata> unsafeMetadata = Optional.empty();
  
@@ -695,11 +689,11 @@ public final static class Builder {
  
         private Boolean customAction;
  
-        private JsonNullable<? extends String> externalId = JsonNullable.undefined();
+        private JsonNullable<String> externalId = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> createdSessionId = JsonNullable.undefined();
+        private JsonNullable<String> createdSessionId = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> createdUserId = JsonNullable.undefined();
+        private JsonNullable<String> createdUserId = JsonNullable.undefined();
  
         private Long abandonAt;
  
@@ -727,49 +721,49 @@ public Builder status(SignUpStatus status) {
             return this;
         }
 
-        public Builder requiredFields(java.util.List<String> requiredFields) {
+        public Builder requiredFields(List<String> requiredFields) {
             Utils.checkNotNull(requiredFields, "requiredFields");
             this.requiredFields = Optional.ofNullable(requiredFields);
             return this;
         }
 
-        public Builder requiredFields(Optional<? extends java.util.List<String>> requiredFields) {
+        public Builder requiredFields(Optional<? extends List<String>> requiredFields) {
             Utils.checkNotNull(requiredFields, "requiredFields");
             this.requiredFields = requiredFields;
             return this;
         }
 
-        public Builder optionalFields(java.util.List<String> optionalFields) {
+        public Builder optionalFields(List<String> optionalFields) {
             Utils.checkNotNull(optionalFields, "optionalFields");
             this.optionalFields = Optional.ofNullable(optionalFields);
             return this;
         }
 
-        public Builder optionalFields(Optional<? extends java.util.List<String>> optionalFields) {
+        public Builder optionalFields(Optional<? extends List<String>> optionalFields) {
             Utils.checkNotNull(optionalFields, "optionalFields");
             this.optionalFields = optionalFields;
             return this;
         }
 
-        public Builder missingFields(java.util.List<String> missingFields) {
+        public Builder missingFields(List<String> missingFields) {
             Utils.checkNotNull(missingFields, "missingFields");
             this.missingFields = Optional.ofNullable(missingFields);
             return this;
         }
 
-        public Builder missingFields(Optional<? extends java.util.List<String>> missingFields) {
+        public Builder missingFields(Optional<? extends List<String>> missingFields) {
             Utils.checkNotNull(missingFields, "missingFields");
             this.missingFields = missingFields;
             return this;
         }
 
-        public Builder unverifiedFields(java.util.List<String> unverifiedFields) {
+        public Builder unverifiedFields(List<String> unverifiedFields) {
             Utils.checkNotNull(unverifiedFields, "unverifiedFields");
             this.unverifiedFields = Optional.ofNullable(unverifiedFields);
             return this;
         }
 
-        public Builder unverifiedFields(Optional<? extends java.util.List<String>> unverifiedFields) {
+        public Builder unverifiedFields(Optional<? extends List<String>> unverifiedFields) {
             Utils.checkNotNull(unverifiedFields, "unverifiedFields");
             this.unverifiedFields = unverifiedFields;
             return this;
@@ -793,7 +787,7 @@ public Builder username(String username) {
             return this;
         }
 
-        public Builder username(JsonNullable<? extends String> username) {
+        public Builder username(JsonNullable<String> username) {
             Utils.checkNotNull(username, "username");
             this.username = username;
             return this;
@@ -805,7 +799,7 @@ public Builder emailAddress(String emailAddress) {
             return this;
         }
 
-        public Builder emailAddress(JsonNullable<? extends String> emailAddress) {
+        public Builder emailAddress(JsonNullable<String> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = emailAddress;
             return this;
@@ -817,7 +811,7 @@ public Builder phoneNumber(String phoneNumber) {
             return this;
         }
 
-        public Builder phoneNumber(JsonNullable<? extends String> phoneNumber) {
+        public Builder phoneNumber(JsonNullable<String> phoneNumber) {
             Utils.checkNotNull(phoneNumber, "phoneNumber");
             this.phoneNumber = phoneNumber;
             return this;
@@ -829,7 +823,7 @@ public Builder web3Wallet(String web3Wallet) {
             return this;
         }
 
-        public Builder web3Wallet(JsonNullable<? extends String> web3Wallet) {
+        public Builder web3Wallet(JsonNullable<String> web3Wallet) {
             Utils.checkNotNull(web3Wallet, "web3Wallet");
             this.web3Wallet = web3Wallet;
             return this;
@@ -847,7 +841,7 @@ public Builder firstName(String firstName) {
             return this;
         }
 
-        public Builder firstName(JsonNullable<? extends String> firstName) {
+        public Builder firstName(JsonNullable<String> firstName) {
             Utils.checkNotNull(firstName, "firstName");
             this.firstName = firstName;
             return this;
@@ -859,7 +853,7 @@ public Builder lastName(String lastName) {
             return this;
         }
 
-        public Builder lastName(JsonNullable<? extends String> lastName) {
+        public Builder lastName(JsonNullable<String> lastName) {
             Utils.checkNotNull(lastName, "lastName");
             this.lastName = lastName;
             return this;
@@ -901,7 +895,7 @@ public Builder externalId(String externalId) {
             return this;
         }
 
-        public Builder externalId(JsonNullable<? extends String> externalId) {
+        public Builder externalId(JsonNullable<String> externalId) {
             Utils.checkNotNull(externalId, "externalId");
             this.externalId = externalId;
             return this;
@@ -913,7 +907,7 @@ public Builder createdSessionId(String createdSessionId) {
             return this;
         }
 
-        public Builder createdSessionId(JsonNullable<? extends String> createdSessionId) {
+        public Builder createdSessionId(JsonNullable<String> createdSessionId) {
             Utils.checkNotNull(createdSessionId, "createdSessionId");
             this.createdSessionId = createdSessionId;
             return this;
@@ -925,7 +919,7 @@ public Builder createdUserId(String createdUserId) {
             return this;
         }
 
-        public Builder createdUserId(JsonNullable<? extends String> createdUserId) {
+        public Builder createdUserId(JsonNullable<String> createdUserId) {
             Utils.checkNotNull(createdUserId, "createdUserId");
             this.createdUserId = createdUserId;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/SignUpObject.java b/src/main/java/com/clerk/backend_api/models/components/SignUpObject.java
index 35effd2..c25fb79 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SignUpObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SignUpObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum SignUpObject {
     SIGN_UP_ATTEMPT("sign_up_attempt");
diff --git a/src/main/java/com/clerk/backend_api/models/components/SignUpPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/components/SignUpPublicMetadata.java
index d4f0415..bc25ac9 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SignUpPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SignUpPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class SignUpPublicMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/SignUpStatus.java b/src/main/java/com/clerk/backend_api/models/components/SignUpStatus.java
index 2d25d75..e87a49b 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SignUpStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SignUpStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum SignUpStatus {
     MISSING_REQUIREMENTS("missing_requirements"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/SignUpUnsafeMetadata.java b/src/main/java/com/clerk/backend_api/models/components/SignUpUnsafeMetadata.java
index 7286510..7eb2b92 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SignUpUnsafeMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SignUpUnsafeMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class SignUpUnsafeMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/Status.java b/src/main/java/com/clerk/backend_api/models/components/Status.java
index 5d39188..0e5bf7b 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Status.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Status.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum Status {
     ACTIVE("active"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/Strategy.java b/src/main/java/com/clerk/backend_api/models/components/Strategy.java
index df54cb0..af95ada 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Strategy.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Strategy.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum Strategy {
     PHONE_CODE("phone_code"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/SvixURL.java b/src/main/java/com/clerk/backend_api/models/components/SvixURL.java
index a5b448c..10e4b8a 100644
--- a/src/main/java/com/clerk/backend_api/models/components/SvixURL.java
+++ b/src/main/java/com/clerk/backend_api/models/components/SvixURL.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class SvixURL {
 
@@ -52,12 +51,12 @@ public boolean equals(java.lang.Object o) {
         }
         SvixURL other = (SvixURL) o;
         return 
-            java.util.Objects.deepEquals(this.svixUrl, other.svixUrl);
+            Objects.deepEquals(this.svixUrl, other.svixUrl);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             svixUrl);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/Template.java b/src/main/java/com/clerk/backend_api/models/components/Template.java
index ac0b30d..53dec92 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Template.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Template.java
@@ -4,26 +4,29 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class Template {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("id")
-    private Optional<? extends String> id;
+    private Optional<String> id;
 
     /**
      * String representing the object's type. Objects of the same type share the same value.
@@ -38,110 +41,110 @@ public class Template {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("instance_id")
-    private JsonNullable<? extends String> instanceId;
+    private JsonNullable<String> instanceId;
 
     /**
      * whether this is a system (default) or user overridden) template
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("resource_type")
-    private Optional<? extends String> resourceType;
+    private Optional<String> resourceType;
 
     /**
      * whether this is an email or SMS template
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("template_type")
-    private Optional<? extends String> templateType;
+    private Optional<String> templateType;
 
     /**
      * user-friendly name of the template
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("name")
-    private Optional<? extends String> name;
+    private Optional<String> name;
 
     /**
      * machine-friendly name of the template
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("slug")
-    private Optional<? extends String> slug;
+    private Optional<String> slug;
 
     /**
      * position with the listing of templates
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("position")
-    private Optional<? extends Long> position;
+    private Optional<Long> position;
 
     /**
      * whether this template can be reverted to the corresponding system default
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("can_revert")
-    private Optional<? extends Boolean> canRevert;
+    private Optional<Boolean> canRevert;
 
     /**
      * whether this template can be deleted
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("can_delete")
-    private Optional<? extends Boolean> canDelete;
+    private Optional<Boolean> canDelete;
 
     /**
      * whether this template can be disabled, true only for notification SMS templates
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("can_disable")
-    private Optional<? extends Boolean> canDisable;
+    private Optional<Boolean> canDisable;
 
     /**
      * email subject
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("subject")
-    private JsonNullable<? extends String> subject;
+    private JsonNullable<String> subject;
 
     /**
      * the editor markup used to generate the body of the template
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("markup")
-    private Optional<? extends String> markup;
+    private Optional<String> markup;
 
     /**
      * the template body before variable interpolation
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("body")
-    private Optional<? extends String> body;
+    private Optional<String> body;
 
     /**
      * list of variables that are available for use in the template body
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("available_variables")
-    private Optional<? extends java.util.List<String>> availableVariables;
+    private Optional<? extends List<String>> availableVariables;
 
     /**
      * list of variables that must be contained in the template body
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("required_variables")
-    private Optional<? extends java.util.List<String>> requiredVariables;
+    private Optional<? extends List<String>> requiredVariables;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("from_email_name")
-    private Optional<? extends String> fromEmailName;
+    private Optional<String> fromEmailName;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("reply_to_email_name")
-    private Optional<? extends String> replyToEmailName;
+    private Optional<String> replyToEmailName;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("delivered_by_clerk")
-    private Optional<? extends Boolean> deliveredByClerk;
+    private Optional<Boolean> deliveredByClerk;
 
     /**
      * Unix timestamp of last update.
@@ -149,7 +152,7 @@ public class Template {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("updated_at")
-    private Optional<? extends Long> updatedAt;
+    private Optional<Long> updatedAt;
 
     /**
      * Unix timestamp of creation.
@@ -157,31 +160,31 @@ public class Template {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("created_at")
-    private Optional<? extends Long> createdAt;
+    private Optional<Long> createdAt;
 
     @JsonCreator
     public Template(
-            @JsonProperty("id") Optional<? extends String> id,
+            @JsonProperty("id") Optional<String> id,
             @JsonProperty("object") Optional<? extends TemplateObject> object,
-            @JsonProperty("instance_id") JsonNullable<? extends String> instanceId,
-            @JsonProperty("resource_type") Optional<? extends String> resourceType,
-            @JsonProperty("template_type") Optional<? extends String> templateType,
-            @JsonProperty("name") Optional<? extends String> name,
-            @JsonProperty("slug") Optional<? extends String> slug,
-            @JsonProperty("position") Optional<? extends Long> position,
-            @JsonProperty("can_revert") Optional<? extends Boolean> canRevert,
-            @JsonProperty("can_delete") Optional<? extends Boolean> canDelete,
-            @JsonProperty("can_disable") Optional<? extends Boolean> canDisable,
-            @JsonProperty("subject") JsonNullable<? extends String> subject,
-            @JsonProperty("markup") Optional<? extends String> markup,
-            @JsonProperty("body") Optional<? extends String> body,
-            @JsonProperty("available_variables") Optional<? extends java.util.List<String>> availableVariables,
-            @JsonProperty("required_variables") Optional<? extends java.util.List<String>> requiredVariables,
-            @JsonProperty("from_email_name") Optional<? extends String> fromEmailName,
-            @JsonProperty("reply_to_email_name") Optional<? extends String> replyToEmailName,
-            @JsonProperty("delivered_by_clerk") Optional<? extends Boolean> deliveredByClerk,
-            @JsonProperty("updated_at") Optional<? extends Long> updatedAt,
-            @JsonProperty("created_at") Optional<? extends Long> createdAt) {
+            @JsonProperty("instance_id") JsonNullable<String> instanceId,
+            @JsonProperty("resource_type") Optional<String> resourceType,
+            @JsonProperty("template_type") Optional<String> templateType,
+            @JsonProperty("name") Optional<String> name,
+            @JsonProperty("slug") Optional<String> slug,
+            @JsonProperty("position") Optional<Long> position,
+            @JsonProperty("can_revert") Optional<Boolean> canRevert,
+            @JsonProperty("can_delete") Optional<Boolean> canDelete,
+            @JsonProperty("can_disable") Optional<Boolean> canDisable,
+            @JsonProperty("subject") JsonNullable<String> subject,
+            @JsonProperty("markup") Optional<String> markup,
+            @JsonProperty("body") Optional<String> body,
+            @JsonProperty("available_variables") Optional<? extends List<String>> availableVariables,
+            @JsonProperty("required_variables") Optional<? extends List<String>> requiredVariables,
+            @JsonProperty("from_email_name") Optional<String> fromEmailName,
+            @JsonProperty("reply_to_email_name") Optional<String> replyToEmailName,
+            @JsonProperty("delivered_by_clerk") Optional<Boolean> deliveredByClerk,
+            @JsonProperty("updated_at") Optional<Long> updatedAt,
+            @JsonProperty("created_at") Optional<Long> createdAt) {
         Utils.checkNotNull(id, "id");
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(instanceId, "instanceId");
@@ -230,10 +233,9 @@ public Template() {
         this(Optional.empty(), Optional.empty(), JsonNullable.undefined(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), JsonNullable.undefined(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> id() {
-        return (Optional<String>) id;
+        return id;
     }
 
     /**
@@ -249,109 +251,97 @@ public Optional<TemplateObject> object() {
     /**
      * the id of the instance the template belongs to
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> instanceId() {
-        return (JsonNullable<String>) instanceId;
+        return instanceId;
     }
 
     /**
      * whether this is a system (default) or user overridden) template
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> resourceType() {
-        return (Optional<String>) resourceType;
+        return resourceType;
     }
 
     /**
      * whether this is an email or SMS template
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> templateType() {
-        return (Optional<String>) templateType;
+        return templateType;
     }
 
     /**
      * user-friendly name of the template
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> name() {
-        return (Optional<String>) name;
+        return name;
     }
 
     /**
      * machine-friendly name of the template
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> slug() {
-        return (Optional<String>) slug;
+        return slug;
     }
 
     /**
      * position with the listing of templates
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> position() {
-        return (Optional<Long>) position;
+        return position;
     }
 
     /**
      * whether this template can be reverted to the corresponding system default
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> canRevert() {
-        return (Optional<Boolean>) canRevert;
+        return canRevert;
     }
 
     /**
      * whether this template can be deleted
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> canDelete() {
-        return (Optional<Boolean>) canDelete;
+        return canDelete;
     }
 
     /**
      * whether this template can be disabled, true only for notification SMS templates
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> canDisable() {
-        return (Optional<Boolean>) canDisable;
+        return canDisable;
     }
 
     /**
      * email subject
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> subject() {
-        return (JsonNullable<String>) subject;
+        return subject;
     }
 
     /**
      * the editor markup used to generate the body of the template
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> markup() {
-        return (Optional<String>) markup;
+        return markup;
     }
 
     /**
      * the template body before variable interpolation
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> body() {
-        return (Optional<String>) body;
+        return body;
     }
 
     /**
@@ -359,8 +349,8 @@ public Optional<String> body() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> availableVariables() {
-        return (Optional<java.util.List<String>>) availableVariables;
+    public Optional<List<String>> availableVariables() {
+        return (Optional<List<String>>) availableVariables;
     }
 
     /**
@@ -368,46 +358,41 @@ public Optional<java.util.List<String>> availableVariables() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> requiredVariables() {
-        return (Optional<java.util.List<String>>) requiredVariables;
+    public Optional<List<String>> requiredVariables() {
+        return (Optional<List<String>>) requiredVariables;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> fromEmailName() {
-        return (Optional<String>) fromEmailName;
+        return fromEmailName;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> replyToEmailName() {
-        return (Optional<String>) replyToEmailName;
+        return replyToEmailName;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> deliveredByClerk() {
-        return (Optional<Boolean>) deliveredByClerk;
+        return deliveredByClerk;
     }
 
     /**
      * Unix timestamp of last update.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> updatedAt() {
-        return (Optional<Long>) updatedAt;
+        return updatedAt;
     }
 
     /**
      * Unix timestamp of creation.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> createdAt() {
-        return (Optional<Long>) createdAt;
+        return createdAt;
     }
 
     public final static Builder builder() {
@@ -420,7 +405,7 @@ public Template withId(String id) {
         return this;
     }
 
-    public Template withId(Optional<? extends String> id) {
+    public Template withId(Optional<String> id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
@@ -458,7 +443,7 @@ public Template withInstanceId(String instanceId) {
     /**
      * the id of the instance the template belongs to
      */
-    public Template withInstanceId(JsonNullable<? extends String> instanceId) {
+    public Template withInstanceId(JsonNullable<String> instanceId) {
         Utils.checkNotNull(instanceId, "instanceId");
         this.instanceId = instanceId;
         return this;
@@ -476,7 +461,7 @@ public Template withResourceType(String resourceType) {
     /**
      * whether this is a system (default) or user overridden) template
      */
-    public Template withResourceType(Optional<? extends String> resourceType) {
+    public Template withResourceType(Optional<String> resourceType) {
         Utils.checkNotNull(resourceType, "resourceType");
         this.resourceType = resourceType;
         return this;
@@ -494,7 +479,7 @@ public Template withTemplateType(String templateType) {
     /**
      * whether this is an email or SMS template
      */
-    public Template withTemplateType(Optional<? extends String> templateType) {
+    public Template withTemplateType(Optional<String> templateType) {
         Utils.checkNotNull(templateType, "templateType");
         this.templateType = templateType;
         return this;
@@ -512,7 +497,7 @@ public Template withName(String name) {
     /**
      * user-friendly name of the template
      */
-    public Template withName(Optional<? extends String> name) {
+    public Template withName(Optional<String> name) {
         Utils.checkNotNull(name, "name");
         this.name = name;
         return this;
@@ -530,7 +515,7 @@ public Template withSlug(String slug) {
     /**
      * machine-friendly name of the template
      */
-    public Template withSlug(Optional<? extends String> slug) {
+    public Template withSlug(Optional<String> slug) {
         Utils.checkNotNull(slug, "slug");
         this.slug = slug;
         return this;
@@ -548,7 +533,7 @@ public Template withPosition(long position) {
     /**
      * position with the listing of templates
      */
-    public Template withPosition(Optional<? extends Long> position) {
+    public Template withPosition(Optional<Long> position) {
         Utils.checkNotNull(position, "position");
         this.position = position;
         return this;
@@ -566,7 +551,7 @@ public Template withCanRevert(boolean canRevert) {
     /**
      * whether this template can be reverted to the corresponding system default
      */
-    public Template withCanRevert(Optional<? extends Boolean> canRevert) {
+    public Template withCanRevert(Optional<Boolean> canRevert) {
         Utils.checkNotNull(canRevert, "canRevert");
         this.canRevert = canRevert;
         return this;
@@ -584,7 +569,7 @@ public Template withCanDelete(boolean canDelete) {
     /**
      * whether this template can be deleted
      */
-    public Template withCanDelete(Optional<? extends Boolean> canDelete) {
+    public Template withCanDelete(Optional<Boolean> canDelete) {
         Utils.checkNotNull(canDelete, "canDelete");
         this.canDelete = canDelete;
         return this;
@@ -602,7 +587,7 @@ public Template withCanDisable(boolean canDisable) {
     /**
      * whether this template can be disabled, true only for notification SMS templates
      */
-    public Template withCanDisable(Optional<? extends Boolean> canDisable) {
+    public Template withCanDisable(Optional<Boolean> canDisable) {
         Utils.checkNotNull(canDisable, "canDisable");
         this.canDisable = canDisable;
         return this;
@@ -620,7 +605,7 @@ public Template withSubject(String subject) {
     /**
      * email subject
      */
-    public Template withSubject(JsonNullable<? extends String> subject) {
+    public Template withSubject(JsonNullable<String> subject) {
         Utils.checkNotNull(subject, "subject");
         this.subject = subject;
         return this;
@@ -638,7 +623,7 @@ public Template withMarkup(String markup) {
     /**
      * the editor markup used to generate the body of the template
      */
-    public Template withMarkup(Optional<? extends String> markup) {
+    public Template withMarkup(Optional<String> markup) {
         Utils.checkNotNull(markup, "markup");
         this.markup = markup;
         return this;
@@ -656,7 +641,7 @@ public Template withBody(String body) {
     /**
      * the template body before variable interpolation
      */
-    public Template withBody(Optional<? extends String> body) {
+    public Template withBody(Optional<String> body) {
         Utils.checkNotNull(body, "body");
         this.body = body;
         return this;
@@ -665,7 +650,7 @@ public Template withBody(Optional<? extends String> body) {
     /**
      * list of variables that are available for use in the template body
      */
-    public Template withAvailableVariables(java.util.List<String> availableVariables) {
+    public Template withAvailableVariables(List<String> availableVariables) {
         Utils.checkNotNull(availableVariables, "availableVariables");
         this.availableVariables = Optional.ofNullable(availableVariables);
         return this;
@@ -674,7 +659,7 @@ public Template withAvailableVariables(java.util.List<String> availableVariables
     /**
      * list of variables that are available for use in the template body
      */
-    public Template withAvailableVariables(Optional<? extends java.util.List<String>> availableVariables) {
+    public Template withAvailableVariables(Optional<? extends List<String>> availableVariables) {
         Utils.checkNotNull(availableVariables, "availableVariables");
         this.availableVariables = availableVariables;
         return this;
@@ -683,7 +668,7 @@ public Template withAvailableVariables(Optional<? extends java.util.List<String>
     /**
      * list of variables that must be contained in the template body
      */
-    public Template withRequiredVariables(java.util.List<String> requiredVariables) {
+    public Template withRequiredVariables(List<String> requiredVariables) {
         Utils.checkNotNull(requiredVariables, "requiredVariables");
         this.requiredVariables = Optional.ofNullable(requiredVariables);
         return this;
@@ -692,7 +677,7 @@ public Template withRequiredVariables(java.util.List<String> requiredVariables)
     /**
      * list of variables that must be contained in the template body
      */
-    public Template withRequiredVariables(Optional<? extends java.util.List<String>> requiredVariables) {
+    public Template withRequiredVariables(Optional<? extends List<String>> requiredVariables) {
         Utils.checkNotNull(requiredVariables, "requiredVariables");
         this.requiredVariables = requiredVariables;
         return this;
@@ -704,7 +689,7 @@ public Template withFromEmailName(String fromEmailName) {
         return this;
     }
 
-    public Template withFromEmailName(Optional<? extends String> fromEmailName) {
+    public Template withFromEmailName(Optional<String> fromEmailName) {
         Utils.checkNotNull(fromEmailName, "fromEmailName");
         this.fromEmailName = fromEmailName;
         return this;
@@ -716,7 +701,7 @@ public Template withReplyToEmailName(String replyToEmailName) {
         return this;
     }
 
-    public Template withReplyToEmailName(Optional<? extends String> replyToEmailName) {
+    public Template withReplyToEmailName(Optional<String> replyToEmailName) {
         Utils.checkNotNull(replyToEmailName, "replyToEmailName");
         this.replyToEmailName = replyToEmailName;
         return this;
@@ -728,7 +713,7 @@ public Template withDeliveredByClerk(boolean deliveredByClerk) {
         return this;
     }
 
-    public Template withDeliveredByClerk(Optional<? extends Boolean> deliveredByClerk) {
+    public Template withDeliveredByClerk(Optional<Boolean> deliveredByClerk) {
         Utils.checkNotNull(deliveredByClerk, "deliveredByClerk");
         this.deliveredByClerk = deliveredByClerk;
         return this;
@@ -748,7 +733,7 @@ public Template withUpdatedAt(long updatedAt) {
      * Unix timestamp of last update.
      * 
      */
-    public Template withUpdatedAt(Optional<? extends Long> updatedAt) {
+    public Template withUpdatedAt(Optional<Long> updatedAt) {
         Utils.checkNotNull(updatedAt, "updatedAt");
         this.updatedAt = updatedAt;
         return this;
@@ -768,7 +753,7 @@ public Template withCreatedAt(long createdAt) {
      * Unix timestamp of creation.
      * 
      */
-    public Template withCreatedAt(Optional<? extends Long> createdAt) {
+    public Template withCreatedAt(Optional<Long> createdAt) {
         Utils.checkNotNull(createdAt, "createdAt");
         this.createdAt = createdAt;
         return this;
@@ -784,32 +769,32 @@ public boolean equals(java.lang.Object o) {
         }
         Template other = (Template) o;
         return 
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.instanceId, other.instanceId) &&
-            java.util.Objects.deepEquals(this.resourceType, other.resourceType) &&
-            java.util.Objects.deepEquals(this.templateType, other.templateType) &&
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.slug, other.slug) &&
-            java.util.Objects.deepEquals(this.position, other.position) &&
-            java.util.Objects.deepEquals(this.canRevert, other.canRevert) &&
-            java.util.Objects.deepEquals(this.canDelete, other.canDelete) &&
-            java.util.Objects.deepEquals(this.canDisable, other.canDisable) &&
-            java.util.Objects.deepEquals(this.subject, other.subject) &&
-            java.util.Objects.deepEquals(this.markup, other.markup) &&
-            java.util.Objects.deepEquals(this.body, other.body) &&
-            java.util.Objects.deepEquals(this.availableVariables, other.availableVariables) &&
-            java.util.Objects.deepEquals(this.requiredVariables, other.requiredVariables) &&
-            java.util.Objects.deepEquals(this.fromEmailName, other.fromEmailName) &&
-            java.util.Objects.deepEquals(this.replyToEmailName, other.replyToEmailName) &&
-            java.util.Objects.deepEquals(this.deliveredByClerk, other.deliveredByClerk) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt);
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.instanceId, other.instanceId) &&
+            Objects.deepEquals(this.resourceType, other.resourceType) &&
+            Objects.deepEquals(this.templateType, other.templateType) &&
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.slug, other.slug) &&
+            Objects.deepEquals(this.position, other.position) &&
+            Objects.deepEquals(this.canRevert, other.canRevert) &&
+            Objects.deepEquals(this.canDelete, other.canDelete) &&
+            Objects.deepEquals(this.canDisable, other.canDisable) &&
+            Objects.deepEquals(this.subject, other.subject) &&
+            Objects.deepEquals(this.markup, other.markup) &&
+            Objects.deepEquals(this.body, other.body) &&
+            Objects.deepEquals(this.availableVariables, other.availableVariables) &&
+            Objects.deepEquals(this.requiredVariables, other.requiredVariables) &&
+            Objects.deepEquals(this.fromEmailName, other.fromEmailName) &&
+            Objects.deepEquals(this.replyToEmailName, other.replyToEmailName) &&
+            Objects.deepEquals(this.deliveredByClerk, other.deliveredByClerk) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt) &&
+            Objects.deepEquals(this.createdAt, other.createdAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             id,
             object,
             instanceId,
@@ -861,47 +846,47 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> id = Optional.empty();
+        private Optional<String> id = Optional.empty();
  
         private Optional<? extends TemplateObject> object = Optional.empty();
  
-        private JsonNullable<? extends String> instanceId = JsonNullable.undefined();
+        private JsonNullable<String> instanceId = JsonNullable.undefined();
  
-        private Optional<? extends String> resourceType = Optional.empty();
+        private Optional<String> resourceType = Optional.empty();
  
-        private Optional<? extends String> templateType = Optional.empty();
+        private Optional<String> templateType = Optional.empty();
  
-        private Optional<? extends String> name = Optional.empty();
+        private Optional<String> name = Optional.empty();
  
-        private Optional<? extends String> slug = Optional.empty();
+        private Optional<String> slug = Optional.empty();
  
-        private Optional<? extends Long> position = Optional.empty();
+        private Optional<Long> position = Optional.empty();
  
-        private Optional<? extends Boolean> canRevert = Optional.empty();
+        private Optional<Boolean> canRevert = Optional.empty();
  
-        private Optional<? extends Boolean> canDelete = Optional.empty();
+        private Optional<Boolean> canDelete = Optional.empty();
  
-        private Optional<? extends Boolean> canDisable = Optional.empty();
+        private Optional<Boolean> canDisable = Optional.empty();
  
-        private JsonNullable<? extends String> subject = JsonNullable.undefined();
+        private JsonNullable<String> subject = JsonNullable.undefined();
  
-        private Optional<? extends String> markup = Optional.empty();
+        private Optional<String> markup = Optional.empty();
  
-        private Optional<? extends String> body = Optional.empty();
+        private Optional<String> body = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> availableVariables = Optional.empty();
+        private Optional<? extends List<String>> availableVariables = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> requiredVariables = Optional.empty();
+        private Optional<? extends List<String>> requiredVariables = Optional.empty();
  
-        private Optional<? extends String> fromEmailName = Optional.empty();
+        private Optional<String> fromEmailName = Optional.empty();
  
-        private Optional<? extends String> replyToEmailName = Optional.empty();
+        private Optional<String> replyToEmailName = Optional.empty();
  
-        private Optional<? extends Boolean> deliveredByClerk = Optional.empty();
+        private Optional<Boolean> deliveredByClerk = Optional.empty();
  
-        private Optional<? extends Long> updatedAt = Optional.empty();
+        private Optional<Long> updatedAt = Optional.empty();
  
-        private Optional<? extends Long> createdAt = Optional.empty();  
+        private Optional<Long> createdAt = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -913,7 +898,7 @@ public Builder id(String id) {
             return this;
         }
 
-        public Builder id(Optional<? extends String> id) {
+        public Builder id(Optional<String> id) {
             Utils.checkNotNull(id, "id");
             this.id = id;
             return this;
@@ -951,7 +936,7 @@ public Builder instanceId(String instanceId) {
         /**
          * the id of the instance the template belongs to
          */
-        public Builder instanceId(JsonNullable<? extends String> instanceId) {
+        public Builder instanceId(JsonNullable<String> instanceId) {
             Utils.checkNotNull(instanceId, "instanceId");
             this.instanceId = instanceId;
             return this;
@@ -969,7 +954,7 @@ public Builder resourceType(String resourceType) {
         /**
          * whether this is a system (default) or user overridden) template
          */
-        public Builder resourceType(Optional<? extends String> resourceType) {
+        public Builder resourceType(Optional<String> resourceType) {
             Utils.checkNotNull(resourceType, "resourceType");
             this.resourceType = resourceType;
             return this;
@@ -987,7 +972,7 @@ public Builder templateType(String templateType) {
         /**
          * whether this is an email or SMS template
          */
-        public Builder templateType(Optional<? extends String> templateType) {
+        public Builder templateType(Optional<String> templateType) {
             Utils.checkNotNull(templateType, "templateType");
             this.templateType = templateType;
             return this;
@@ -1005,7 +990,7 @@ public Builder name(String name) {
         /**
          * user-friendly name of the template
          */
-        public Builder name(Optional<? extends String> name) {
+        public Builder name(Optional<String> name) {
             Utils.checkNotNull(name, "name");
             this.name = name;
             return this;
@@ -1023,7 +1008,7 @@ public Builder slug(String slug) {
         /**
          * machine-friendly name of the template
          */
-        public Builder slug(Optional<? extends String> slug) {
+        public Builder slug(Optional<String> slug) {
             Utils.checkNotNull(slug, "slug");
             this.slug = slug;
             return this;
@@ -1041,7 +1026,7 @@ public Builder position(long position) {
         /**
          * position with the listing of templates
          */
-        public Builder position(Optional<? extends Long> position) {
+        public Builder position(Optional<Long> position) {
             Utils.checkNotNull(position, "position");
             this.position = position;
             return this;
@@ -1059,7 +1044,7 @@ public Builder canRevert(boolean canRevert) {
         /**
          * whether this template can be reverted to the corresponding system default
          */
-        public Builder canRevert(Optional<? extends Boolean> canRevert) {
+        public Builder canRevert(Optional<Boolean> canRevert) {
             Utils.checkNotNull(canRevert, "canRevert");
             this.canRevert = canRevert;
             return this;
@@ -1077,7 +1062,7 @@ public Builder canDelete(boolean canDelete) {
         /**
          * whether this template can be deleted
          */
-        public Builder canDelete(Optional<? extends Boolean> canDelete) {
+        public Builder canDelete(Optional<Boolean> canDelete) {
             Utils.checkNotNull(canDelete, "canDelete");
             this.canDelete = canDelete;
             return this;
@@ -1095,7 +1080,7 @@ public Builder canDisable(boolean canDisable) {
         /**
          * whether this template can be disabled, true only for notification SMS templates
          */
-        public Builder canDisable(Optional<? extends Boolean> canDisable) {
+        public Builder canDisable(Optional<Boolean> canDisable) {
             Utils.checkNotNull(canDisable, "canDisable");
             this.canDisable = canDisable;
             return this;
@@ -1113,7 +1098,7 @@ public Builder subject(String subject) {
         /**
          * email subject
          */
-        public Builder subject(JsonNullable<? extends String> subject) {
+        public Builder subject(JsonNullable<String> subject) {
             Utils.checkNotNull(subject, "subject");
             this.subject = subject;
             return this;
@@ -1131,7 +1116,7 @@ public Builder markup(String markup) {
         /**
          * the editor markup used to generate the body of the template
          */
-        public Builder markup(Optional<? extends String> markup) {
+        public Builder markup(Optional<String> markup) {
             Utils.checkNotNull(markup, "markup");
             this.markup = markup;
             return this;
@@ -1149,7 +1134,7 @@ public Builder body(String body) {
         /**
          * the template body before variable interpolation
          */
-        public Builder body(Optional<? extends String> body) {
+        public Builder body(Optional<String> body) {
             Utils.checkNotNull(body, "body");
             this.body = body;
             return this;
@@ -1158,7 +1143,7 @@ public Builder body(Optional<? extends String> body) {
         /**
          * list of variables that are available for use in the template body
          */
-        public Builder availableVariables(java.util.List<String> availableVariables) {
+        public Builder availableVariables(List<String> availableVariables) {
             Utils.checkNotNull(availableVariables, "availableVariables");
             this.availableVariables = Optional.ofNullable(availableVariables);
             return this;
@@ -1167,7 +1152,7 @@ public Builder availableVariables(java.util.List<String> availableVariables) {
         /**
          * list of variables that are available for use in the template body
          */
-        public Builder availableVariables(Optional<? extends java.util.List<String>> availableVariables) {
+        public Builder availableVariables(Optional<? extends List<String>> availableVariables) {
             Utils.checkNotNull(availableVariables, "availableVariables");
             this.availableVariables = availableVariables;
             return this;
@@ -1176,7 +1161,7 @@ public Builder availableVariables(Optional<? extends java.util.List<String>> ava
         /**
          * list of variables that must be contained in the template body
          */
-        public Builder requiredVariables(java.util.List<String> requiredVariables) {
+        public Builder requiredVariables(List<String> requiredVariables) {
             Utils.checkNotNull(requiredVariables, "requiredVariables");
             this.requiredVariables = Optional.ofNullable(requiredVariables);
             return this;
@@ -1185,7 +1170,7 @@ public Builder requiredVariables(java.util.List<String> requiredVariables) {
         /**
          * list of variables that must be contained in the template body
          */
-        public Builder requiredVariables(Optional<? extends java.util.List<String>> requiredVariables) {
+        public Builder requiredVariables(Optional<? extends List<String>> requiredVariables) {
             Utils.checkNotNull(requiredVariables, "requiredVariables");
             this.requiredVariables = requiredVariables;
             return this;
@@ -1197,7 +1182,7 @@ public Builder fromEmailName(String fromEmailName) {
             return this;
         }
 
-        public Builder fromEmailName(Optional<? extends String> fromEmailName) {
+        public Builder fromEmailName(Optional<String> fromEmailName) {
             Utils.checkNotNull(fromEmailName, "fromEmailName");
             this.fromEmailName = fromEmailName;
             return this;
@@ -1209,7 +1194,7 @@ public Builder replyToEmailName(String replyToEmailName) {
             return this;
         }
 
-        public Builder replyToEmailName(Optional<? extends String> replyToEmailName) {
+        public Builder replyToEmailName(Optional<String> replyToEmailName) {
             Utils.checkNotNull(replyToEmailName, "replyToEmailName");
             this.replyToEmailName = replyToEmailName;
             return this;
@@ -1221,7 +1206,7 @@ public Builder deliveredByClerk(boolean deliveredByClerk) {
             return this;
         }
 
-        public Builder deliveredByClerk(Optional<? extends Boolean> deliveredByClerk) {
+        public Builder deliveredByClerk(Optional<Boolean> deliveredByClerk) {
             Utils.checkNotNull(deliveredByClerk, "deliveredByClerk");
             this.deliveredByClerk = deliveredByClerk;
             return this;
@@ -1241,7 +1226,7 @@ public Builder updatedAt(long updatedAt) {
          * Unix timestamp of last update.
          * 
          */
-        public Builder updatedAt(Optional<? extends Long> updatedAt) {
+        public Builder updatedAt(Optional<Long> updatedAt) {
             Utils.checkNotNull(updatedAt, "updatedAt");
             this.updatedAt = updatedAt;
             return this;
@@ -1261,7 +1246,7 @@ public Builder createdAt(long createdAt) {
          * Unix timestamp of creation.
          * 
          */
-        public Builder createdAt(Optional<? extends Long> createdAt) {
+        public Builder createdAt(Optional<Long> createdAt) {
             Utils.checkNotNull(createdAt, "createdAt");
             this.createdAt = createdAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/TemplateObject.java b/src/main/java/com/clerk/backend_api/models/components/TemplateObject.java
index f3162e1..1e3eaa0 100644
--- a/src/main/java/com/clerk/backend_api/models/components/TemplateObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/TemplateObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * TemplateObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/TestingToken.java b/src/main/java/com/clerk/backend_api/models/components/TestingToken.java
index 5604266..eb09bcc 100644
--- a/src/main/java/com/clerk/backend_api/models/components/TestingToken.java
+++ b/src/main/java/com/clerk/backend_api/models/components/TestingToken.java
@@ -4,16 +4,16 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class TestingToken {
 
@@ -107,14 +107,14 @@ public boolean equals(java.lang.Object o) {
         }
         TestingToken other = (TestingToken) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.token, other.token) &&
-            java.util.Objects.deepEquals(this.expiresAt, other.expiresAt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.token, other.token) &&
+            Objects.deepEquals(this.expiresAt, other.expiresAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             token,
             expiresAt);
diff --git a/src/main/java/com/clerk/backend_api/models/components/TestingTokenObject.java b/src/main/java/com/clerk/backend_api/models/components/TestingTokenObject.java
index 9d522ba..3bb089a 100644
--- a/src/main/java/com/clerk/backend_api/models/components/TestingTokenObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/TestingTokenObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum TestingTokenObject {
     TESTING_TOKEN("testing_token");
diff --git a/src/main/java/com/clerk/backend_api/models/components/Ticket.java b/src/main/java/com/clerk/backend_api/models/components/Ticket.java
index 642bb66..8356343 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Ticket.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Ticket.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class Ticket {
 
     @JsonProperty("status")
@@ -28,18 +28,18 @@ public class Ticket {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("attempts")
-    private JsonNullable<? extends Long> attempts;
+    private JsonNullable<Long> attempts;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("expire_at")
-    private JsonNullable<? extends Long> expireAt;
+    private JsonNullable<Long> expireAt;
 
     @JsonCreator
     public Ticket(
             @JsonProperty("status") TicketVerificationStatus status,
             @JsonProperty("strategy") TicketVerificationStrategy strategy,
-            @JsonProperty("attempts") JsonNullable<? extends Long> attempts,
-            @JsonProperty("expire_at") JsonNullable<? extends Long> expireAt) {
+            @JsonProperty("attempts") JsonNullable<Long> attempts,
+            @JsonProperty("expire_at") JsonNullable<Long> expireAt) {
         Utils.checkNotNull(status, "status");
         Utils.checkNotNull(strategy, "strategy");
         Utils.checkNotNull(attempts, "attempts");
@@ -66,16 +66,14 @@ public TicketVerificationStrategy strategy() {
         return strategy;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> attempts() {
-        return (JsonNullable<Long>) attempts;
+        return attempts;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> expireAt() {
-        return (JsonNullable<Long>) expireAt;
+        return expireAt;
     }
 
     public final static Builder builder() {
@@ -100,7 +98,7 @@ public Ticket withAttempts(long attempts) {
         return this;
     }
 
-    public Ticket withAttempts(JsonNullable<? extends Long> attempts) {
+    public Ticket withAttempts(JsonNullable<Long> attempts) {
         Utils.checkNotNull(attempts, "attempts");
         this.attempts = attempts;
         return this;
@@ -112,7 +110,7 @@ public Ticket withExpireAt(long expireAt) {
         return this;
     }
 
-    public Ticket withExpireAt(JsonNullable<? extends Long> expireAt) {
+    public Ticket withExpireAt(JsonNullable<Long> expireAt) {
         Utils.checkNotNull(expireAt, "expireAt");
         this.expireAt = expireAt;
         return this;
@@ -128,15 +126,15 @@ public boolean equals(java.lang.Object o) {
         }
         Ticket other = (Ticket) o;
         return 
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.strategy, other.strategy) &&
-            java.util.Objects.deepEquals(this.attempts, other.attempts) &&
-            java.util.Objects.deepEquals(this.expireAt, other.expireAt);
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.strategy, other.strategy) &&
+            Objects.deepEquals(this.attempts, other.attempts) &&
+            Objects.deepEquals(this.expireAt, other.expireAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             status,
             strategy,
             attempts,
@@ -158,9 +156,9 @@ public final static class Builder {
  
         private TicketVerificationStrategy strategy;
  
-        private JsonNullable<? extends Long> attempts = JsonNullable.undefined();
+        private JsonNullable<Long> attempts = JsonNullable.undefined();
  
-        private JsonNullable<? extends Long> expireAt = JsonNullable.undefined();  
+        private JsonNullable<Long> expireAt = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -184,7 +182,7 @@ public Builder attempts(long attempts) {
             return this;
         }
 
-        public Builder attempts(JsonNullable<? extends Long> attempts) {
+        public Builder attempts(JsonNullable<Long> attempts) {
             Utils.checkNotNull(attempts, "attempts");
             this.attempts = attempts;
             return this;
@@ -196,7 +194,7 @@ public Builder expireAt(long expireAt) {
             return this;
         }
 
-        public Builder expireAt(JsonNullable<? extends Long> expireAt) {
+        public Builder expireAt(JsonNullable<Long> expireAt) {
             Utils.checkNotNull(expireAt, "expireAt");
             this.expireAt = expireAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/TicketVerificationStatus.java b/src/main/java/com/clerk/backend_api/models/components/TicketVerificationStatus.java
index b6a1e2c..f6c0754 100644
--- a/src/main/java/com/clerk/backend_api/models/components/TicketVerificationStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/TicketVerificationStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum TicketVerificationStatus {
     UNVERIFIED("unverified"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/TicketVerificationStrategy.java b/src/main/java/com/clerk/backend_api/models/components/TicketVerificationStrategy.java
index f5ec634..b7c027a 100644
--- a/src/main/java/com/clerk/backend_api/models/components/TicketVerificationStrategy.java
+++ b/src/main/java/com/clerk/backend_api/models/components/TicketVerificationStrategy.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum TicketVerificationStrategy {
     TICKET("ticket");
diff --git a/src/main/java/com/clerk/backend_api/models/components/TotalCount.java b/src/main/java/com/clerk/backend_api/models/components/TotalCount.java
index d7f0428..dd8a52a 100644
--- a/src/main/java/com/clerk/backend_api/models/components/TotalCount.java
+++ b/src/main/java/com/clerk/backend_api/models/components/TotalCount.java
@@ -4,16 +4,16 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class TotalCount {
 
@@ -81,13 +81,13 @@ public boolean equals(java.lang.Object o) {
         }
         TotalCount other = (TotalCount) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.totalCount, other.totalCount);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.totalCount, other.totalCount);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             totalCount);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/components/TotalCountObject.java b/src/main/java/com/clerk/backend_api/models/components/TotalCountObject.java
index c69e728..b9eea71 100644
--- a/src/main/java/com/clerk/backend_api/models/components/TotalCountObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/TotalCountObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * TotalCountObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/Type.java b/src/main/java/com/clerk/backend_api/models/components/Type.java
index 45d9fb8..5531d67 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Type.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Type.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum Type {
     OAUTH_GOOGLE("oauth_google"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/UnsafeMetadata.java b/src/main/java/com/clerk/backend_api/models/components/UnsafeMetadata.java
index c8d503b..266c074 100644
--- a/src/main/java/com/clerk/backend_api/models/components/UnsafeMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/components/UnsafeMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class UnsafeMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/User.java b/src/main/java/com/clerk/backend_api/models/components/User.java
index d78127b..619553c 100644
--- a/src/main/java/com/clerk/backend_api/models/components/User.java
+++ b/src/main/java/com/clerk/backend_api/models/components/User.java
@@ -4,26 +4,30 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
+import java.lang.Boolean;
 import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class User {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("id")
-    private Optional<? extends String> id;
+    private Optional<String> id;
 
     /**
      * String representing the object's type. Objects of the same type share the same value.
@@ -35,31 +39,31 @@ public class User {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("external_id")
-    private JsonNullable<? extends String> externalId;
+    private JsonNullable<String> externalId;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("primary_email_address_id")
-    private JsonNullable<? extends String> primaryEmailAddressId;
+    private JsonNullable<String> primaryEmailAddressId;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("primary_phone_number_id")
-    private JsonNullable<? extends String> primaryPhoneNumberId;
+    private JsonNullable<String> primaryPhoneNumberId;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("primary_web3_wallet_id")
-    private JsonNullable<? extends String> primaryWeb3WalletId;
+    private JsonNullable<String> primaryWeb3WalletId;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("username")
-    private JsonNullable<? extends String> username;
+    private JsonNullable<String> username;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("first_name")
-    private JsonNullable<? extends String> firstName;
+    private JsonNullable<String> firstName;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("last_name")
-    private JsonNullable<? extends String> lastName;
+    private JsonNullable<String> lastName;
 
     /**
      * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
@@ -67,15 +71,15 @@ public class User {
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("profile_image_url")
     @Deprecated
-    private Optional<? extends String> profileImageUrl;
+    private Optional<String> profileImageUrl;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("image_url")
-    private Optional<? extends String> imageUrl;
+    private Optional<String> imageUrl;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("has_image")
-    private Optional<? extends Boolean> hasImage;
+    private Optional<Boolean> hasImage;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("public_metadata")
@@ -91,35 +95,35 @@ public class User {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("email_addresses")
-    private Optional<? extends java.util.List<EmailAddress>> emailAddresses;
+    private Optional<? extends List<EmailAddress>> emailAddresses;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("phone_numbers")
-    private Optional<? extends java.util.List<PhoneNumber>> phoneNumbers;
+    private Optional<? extends List<PhoneNumber>> phoneNumbers;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("web3_wallets")
-    private Optional<? extends java.util.List<Web3Wallet>> web3Wallets;
+    private Optional<? extends List<Web3Wallet>> web3Wallets;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("passkeys")
-    private Optional<? extends java.util.List<SchemasPasskey>> passkeys;
+    private Optional<? extends List<SchemasPasskey>> passkeys;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("password_enabled")
-    private Optional<? extends Boolean> passwordEnabled;
+    private Optional<Boolean> passwordEnabled;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("two_factor_enabled")
-    private Optional<? extends Boolean> twoFactorEnabled;
+    private Optional<Boolean> twoFactorEnabled;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("totp_enabled")
-    private Optional<? extends Boolean> totpEnabled;
+    private Optional<Boolean> totpEnabled;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("backup_code_enabled")
-    private Optional<? extends Boolean> backupCodeEnabled;
+    private Optional<Boolean> backupCodeEnabled;
 
     /**
      * Unix timestamp of when MFA was last enabled for this user. It should be noted that this field is not nullified if MFA is disabled.
@@ -127,7 +131,7 @@ public class User {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("mfa_enabled_at")
-    private JsonNullable<? extends Long> mfaEnabledAt;
+    private JsonNullable<Long> mfaEnabledAt;
 
     /**
      * Unix timestamp of when MFA was last disabled for this user. It should be noted that this field is not nullified if MFA is enabled again.
@@ -135,15 +139,15 @@ public class User {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("mfa_disabled_at")
-    private JsonNullable<? extends Long> mfaDisabledAt;
+    private JsonNullable<Long> mfaDisabledAt;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("external_accounts")
-    private Optional<? extends java.util.List<ExternalAccounts>> externalAccounts;
+    private Optional<? extends List<ExternalAccounts>> externalAccounts;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("saml_accounts")
-    private Optional<? extends java.util.List<SAMLAccount>> samlAccounts;
+    private Optional<? extends List<SAMLAccount>> samlAccounts;
 
     /**
      * Unix timestamp of last sign-in.
@@ -151,7 +155,7 @@ public class User {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("last_sign_in_at")
-    private JsonNullable<? extends Long> lastSignInAt;
+    private JsonNullable<Long> lastSignInAt;
 
     /**
      * Flag to denote whether user is banned or not.
@@ -159,7 +163,7 @@ public class User {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("banned")
-    private Optional<? extends Boolean> banned;
+    private Optional<Boolean> banned;
 
     /**
      * Flag to denote whether user is currently locked, i.e. restricted from signing in or not.
@@ -167,7 +171,7 @@ public class User {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("locked")
-    private Optional<? extends Boolean> locked;
+    private Optional<Boolean> locked;
 
     /**
      * The number of seconds remaining until the lockout period expires for a locked user. A null value for a locked user indicates that lockout never expires.
@@ -175,7 +179,7 @@ public class User {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("lockout_expires_in_seconds")
-    private JsonNullable<? extends Long> lockoutExpiresInSeconds;
+    private JsonNullable<Long> lockoutExpiresInSeconds;
 
     /**
      * The number of verification attempts remaining until the user is locked. Null if account lockout is not enabled. Note: if a user is locked explicitly via the Backend API, they may still have verification attempts remaining.
@@ -183,7 +187,7 @@ public class User {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("verification_attempts_remaining")
-    private JsonNullable<? extends Long> verificationAttemptsRemaining;
+    private JsonNullable<Long> verificationAttemptsRemaining;
 
     /**
      * Unix timestamp of last update.
@@ -191,7 +195,7 @@ public class User {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("updated_at")
-    private Optional<? extends Long> updatedAt;
+    private Optional<Long> updatedAt;
 
     /**
      * Unix timestamp of creation.
@@ -199,7 +203,7 @@ public class User {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("created_at")
-    private Optional<? extends Long> createdAt;
+    private Optional<Long> createdAt;
 
     /**
      * If enabled, user can delete themselves via FAPI.
@@ -207,7 +211,7 @@ public class User {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("delete_self_enabled")
-    private Optional<? extends Boolean> deleteSelfEnabled;
+    private Optional<Boolean> deleteSelfEnabled;
 
     /**
      * If enabled, user can create organizations via FAPI.
@@ -215,7 +219,7 @@ public class User {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("create_organization_enabled")
-    private Optional<? extends Boolean> createOrganizationEnabled;
+    private Optional<Boolean> createOrganizationEnabled;
 
     /**
      * Unix timestamp of the latest session activity, with day precision.
@@ -223,47 +227,47 @@ public class User {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("last_active_at")
-    private JsonNullable<? extends Long> lastActiveAt;
+    private JsonNullable<Long> lastActiveAt;
 
     @JsonCreator
     public User(
-            @JsonProperty("id") Optional<? extends String> id,
+            @JsonProperty("id") Optional<String> id,
             @JsonProperty("object") Optional<? extends UserObject> object,
-            @JsonProperty("external_id") JsonNullable<? extends String> externalId,
-            @JsonProperty("primary_email_address_id") JsonNullable<? extends String> primaryEmailAddressId,
-            @JsonProperty("primary_phone_number_id") JsonNullable<? extends String> primaryPhoneNumberId,
-            @JsonProperty("primary_web3_wallet_id") JsonNullable<? extends String> primaryWeb3WalletId,
-            @JsonProperty("username") JsonNullable<? extends String> username,
-            @JsonProperty("first_name") JsonNullable<? extends String> firstName,
-            @JsonProperty("last_name") JsonNullable<? extends String> lastName,
-            @JsonProperty("profile_image_url") Optional<? extends String> profileImageUrl,
-            @JsonProperty("image_url") Optional<? extends String> imageUrl,
-            @JsonProperty("has_image") Optional<? extends Boolean> hasImage,
+            @JsonProperty("external_id") JsonNullable<String> externalId,
+            @JsonProperty("primary_email_address_id") JsonNullable<String> primaryEmailAddressId,
+            @JsonProperty("primary_phone_number_id") JsonNullable<String> primaryPhoneNumberId,
+            @JsonProperty("primary_web3_wallet_id") JsonNullable<String> primaryWeb3WalletId,
+            @JsonProperty("username") JsonNullable<String> username,
+            @JsonProperty("first_name") JsonNullable<String> firstName,
+            @JsonProperty("last_name") JsonNullable<String> lastName,
+            @JsonProperty("profile_image_url") Optional<String> profileImageUrl,
+            @JsonProperty("image_url") Optional<String> imageUrl,
+            @JsonProperty("has_image") Optional<Boolean> hasImage,
             @JsonProperty("public_metadata") Optional<? extends PublicMetadata> publicMetadata,
             @JsonProperty("private_metadata") JsonNullable<? extends PrivateMetadata> privateMetadata,
             @JsonProperty("unsafe_metadata") Optional<? extends UnsafeMetadata> unsafeMetadata,
-            @JsonProperty("email_addresses") Optional<? extends java.util.List<EmailAddress>> emailAddresses,
-            @JsonProperty("phone_numbers") Optional<? extends java.util.List<PhoneNumber>> phoneNumbers,
-            @JsonProperty("web3_wallets") Optional<? extends java.util.List<Web3Wallet>> web3Wallets,
-            @JsonProperty("passkeys") Optional<? extends java.util.List<SchemasPasskey>> passkeys,
-            @JsonProperty("password_enabled") Optional<? extends Boolean> passwordEnabled,
-            @JsonProperty("two_factor_enabled") Optional<? extends Boolean> twoFactorEnabled,
-            @JsonProperty("totp_enabled") Optional<? extends Boolean> totpEnabled,
-            @JsonProperty("backup_code_enabled") Optional<? extends Boolean> backupCodeEnabled,
-            @JsonProperty("mfa_enabled_at") JsonNullable<? extends Long> mfaEnabledAt,
-            @JsonProperty("mfa_disabled_at") JsonNullable<? extends Long> mfaDisabledAt,
-            @JsonProperty("external_accounts") Optional<? extends java.util.List<ExternalAccounts>> externalAccounts,
-            @JsonProperty("saml_accounts") Optional<? extends java.util.List<SAMLAccount>> samlAccounts,
-            @JsonProperty("last_sign_in_at") JsonNullable<? extends Long> lastSignInAt,
-            @JsonProperty("banned") Optional<? extends Boolean> banned,
-            @JsonProperty("locked") Optional<? extends Boolean> locked,
-            @JsonProperty("lockout_expires_in_seconds") JsonNullable<? extends Long> lockoutExpiresInSeconds,
-            @JsonProperty("verification_attempts_remaining") JsonNullable<? extends Long> verificationAttemptsRemaining,
-            @JsonProperty("updated_at") Optional<? extends Long> updatedAt,
-            @JsonProperty("created_at") Optional<? extends Long> createdAt,
-            @JsonProperty("delete_self_enabled") Optional<? extends Boolean> deleteSelfEnabled,
-            @JsonProperty("create_organization_enabled") Optional<? extends Boolean> createOrganizationEnabled,
-            @JsonProperty("last_active_at") JsonNullable<? extends Long> lastActiveAt) {
+            @JsonProperty("email_addresses") Optional<? extends List<EmailAddress>> emailAddresses,
+            @JsonProperty("phone_numbers") Optional<? extends List<PhoneNumber>> phoneNumbers,
+            @JsonProperty("web3_wallets") Optional<? extends List<Web3Wallet>> web3Wallets,
+            @JsonProperty("passkeys") Optional<? extends List<SchemasPasskey>> passkeys,
+            @JsonProperty("password_enabled") Optional<Boolean> passwordEnabled,
+            @JsonProperty("two_factor_enabled") Optional<Boolean> twoFactorEnabled,
+            @JsonProperty("totp_enabled") Optional<Boolean> totpEnabled,
+            @JsonProperty("backup_code_enabled") Optional<Boolean> backupCodeEnabled,
+            @JsonProperty("mfa_enabled_at") JsonNullable<Long> mfaEnabledAt,
+            @JsonProperty("mfa_disabled_at") JsonNullable<Long> mfaDisabledAt,
+            @JsonProperty("external_accounts") Optional<? extends List<ExternalAccounts>> externalAccounts,
+            @JsonProperty("saml_accounts") Optional<? extends List<SAMLAccount>> samlAccounts,
+            @JsonProperty("last_sign_in_at") JsonNullable<Long> lastSignInAt,
+            @JsonProperty("banned") Optional<Boolean> banned,
+            @JsonProperty("locked") Optional<Boolean> locked,
+            @JsonProperty("lockout_expires_in_seconds") JsonNullable<Long> lockoutExpiresInSeconds,
+            @JsonProperty("verification_attempts_remaining") JsonNullable<Long> verificationAttemptsRemaining,
+            @JsonProperty("updated_at") Optional<Long> updatedAt,
+            @JsonProperty("created_at") Optional<Long> createdAt,
+            @JsonProperty("delete_self_enabled") Optional<Boolean> deleteSelfEnabled,
+            @JsonProperty("create_organization_enabled") Optional<Boolean> createOrganizationEnabled,
+            @JsonProperty("last_active_at") JsonNullable<Long> lastActiveAt) {
         Utils.checkNotNull(id, "id");
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(externalId, "externalId");
@@ -344,10 +348,9 @@ public User() {
         this(Optional.empty(), Optional.empty(), JsonNullable.undefined(), JsonNullable.undefined(), JsonNullable.undefined(), JsonNullable.undefined(), JsonNullable.undefined(), JsonNullable.undefined(), JsonNullable.undefined(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), JsonNullable.undefined(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), JsonNullable.undefined(), JsonNullable.undefined(), Optional.empty(), Optional.empty(), JsonNullable.undefined(), Optional.empty(), Optional.empty(), JsonNullable.undefined(), JsonNullable.undefined(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), JsonNullable.undefined());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> id() {
-        return (Optional<String>) id;
+        return id;
     }
 
     /**
@@ -360,68 +363,58 @@ public Optional<UserObject> object() {
         return (Optional<UserObject>) object;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> externalId() {
-        return (JsonNullable<String>) externalId;
+        return externalId;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> primaryEmailAddressId() {
-        return (JsonNullable<String>) primaryEmailAddressId;
+        return primaryEmailAddressId;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> primaryPhoneNumberId() {
-        return (JsonNullable<String>) primaryPhoneNumberId;
+        return primaryPhoneNumberId;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> primaryWeb3WalletId() {
-        return (JsonNullable<String>) primaryWeb3WalletId;
+        return primaryWeb3WalletId;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> username() {
-        return (JsonNullable<String>) username;
+        return username;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> firstName() {
-        return (JsonNullable<String>) firstName;
+        return firstName;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> lastName() {
-        return (JsonNullable<String>) lastName;
+        return lastName;
     }
 
     /**
      * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> profileImageUrl() {
-        return (Optional<String>) profileImageUrl;
+        return profileImageUrl;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> imageUrl() {
-        return (Optional<String>) imageUrl;
+        return imageUrl;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> hasImage() {
-        return (Optional<Boolean>) hasImage;
+        return hasImage;
     }
 
     @SuppressWarnings("unchecked")
@@ -444,182 +437,166 @@ public Optional<UnsafeMetadata> unsafeMetadata() {
 
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<EmailAddress>> emailAddresses() {
-        return (Optional<java.util.List<EmailAddress>>) emailAddresses;
+    public Optional<List<EmailAddress>> emailAddresses() {
+        return (Optional<List<EmailAddress>>) emailAddresses;
     }
 
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<PhoneNumber>> phoneNumbers() {
-        return (Optional<java.util.List<PhoneNumber>>) phoneNumbers;
+    public Optional<List<PhoneNumber>> phoneNumbers() {
+        return (Optional<List<PhoneNumber>>) phoneNumbers;
     }
 
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<Web3Wallet>> web3Wallets() {
-        return (Optional<java.util.List<Web3Wallet>>) web3Wallets;
+    public Optional<List<Web3Wallet>> web3Wallets() {
+        return (Optional<List<Web3Wallet>>) web3Wallets;
     }
 
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<SchemasPasskey>> passkeys() {
-        return (Optional<java.util.List<SchemasPasskey>>) passkeys;
+    public Optional<List<SchemasPasskey>> passkeys() {
+        return (Optional<List<SchemasPasskey>>) passkeys;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> passwordEnabled() {
-        return (Optional<Boolean>) passwordEnabled;
+        return passwordEnabled;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> twoFactorEnabled() {
-        return (Optional<Boolean>) twoFactorEnabled;
+        return twoFactorEnabled;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> totpEnabled() {
-        return (Optional<Boolean>) totpEnabled;
+        return totpEnabled;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> backupCodeEnabled() {
-        return (Optional<Boolean>) backupCodeEnabled;
+        return backupCodeEnabled;
     }
 
     /**
      * Unix timestamp of when MFA was last enabled for this user. It should be noted that this field is not nullified if MFA is disabled.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> mfaEnabledAt() {
-        return (JsonNullable<Long>) mfaEnabledAt;
+        return mfaEnabledAt;
     }
 
     /**
      * Unix timestamp of when MFA was last disabled for this user. It should be noted that this field is not nullified if MFA is enabled again.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> mfaDisabledAt() {
-        return (JsonNullable<Long>) mfaDisabledAt;
+        return mfaDisabledAt;
     }
 
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<ExternalAccounts>> externalAccounts() {
-        return (Optional<java.util.List<ExternalAccounts>>) externalAccounts;
+    public Optional<List<ExternalAccounts>> externalAccounts() {
+        return (Optional<List<ExternalAccounts>>) externalAccounts;
     }
 
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<SAMLAccount>> samlAccounts() {
-        return (Optional<java.util.List<SAMLAccount>>) samlAccounts;
+    public Optional<List<SAMLAccount>> samlAccounts() {
+        return (Optional<List<SAMLAccount>>) samlAccounts;
     }
 
     /**
      * Unix timestamp of last sign-in.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> lastSignInAt() {
-        return (JsonNullable<Long>) lastSignInAt;
+        return lastSignInAt;
     }
 
     /**
      * Flag to denote whether user is banned or not.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> banned() {
-        return (Optional<Boolean>) banned;
+        return banned;
     }
 
     /**
      * Flag to denote whether user is currently locked, i.e. restricted from signing in or not.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> locked() {
-        return (Optional<Boolean>) locked;
+        return locked;
     }
 
     /**
      * The number of seconds remaining until the lockout period expires for a locked user. A null value for a locked user indicates that lockout never expires.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> lockoutExpiresInSeconds() {
-        return (JsonNullable<Long>) lockoutExpiresInSeconds;
+        return lockoutExpiresInSeconds;
     }
 
     /**
      * The number of verification attempts remaining until the user is locked. Null if account lockout is not enabled. Note: if a user is locked explicitly via the Backend API, they may still have verification attempts remaining.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> verificationAttemptsRemaining() {
-        return (JsonNullable<Long>) verificationAttemptsRemaining;
+        return verificationAttemptsRemaining;
     }
 
     /**
      * Unix timestamp of last update.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> updatedAt() {
-        return (Optional<Long>) updatedAt;
+        return updatedAt;
     }
 
     /**
      * Unix timestamp of creation.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> createdAt() {
-        return (Optional<Long>) createdAt;
+        return createdAt;
     }
 
     /**
      * If enabled, user can delete themselves via FAPI.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> deleteSelfEnabled() {
-        return (Optional<Boolean>) deleteSelfEnabled;
+        return deleteSelfEnabled;
     }
 
     /**
      * If enabled, user can create organizations via FAPI.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> createOrganizationEnabled() {
-        return (Optional<Boolean>) createOrganizationEnabled;
+        return createOrganizationEnabled;
     }
 
     /**
      * Unix timestamp of the latest session activity, with day precision.
      * 
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> lastActiveAt() {
-        return (JsonNullable<Long>) lastActiveAt;
+        return lastActiveAt;
     }
 
     public final static Builder builder() {
@@ -632,7 +609,7 @@ public User withId(String id) {
         return this;
     }
 
-    public User withId(Optional<? extends String> id) {
+    public User withId(Optional<String> id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
@@ -664,7 +641,7 @@ public User withExternalId(String externalId) {
         return this;
     }
 
-    public User withExternalId(JsonNullable<? extends String> externalId) {
+    public User withExternalId(JsonNullable<String> externalId) {
         Utils.checkNotNull(externalId, "externalId");
         this.externalId = externalId;
         return this;
@@ -676,7 +653,7 @@ public User withPrimaryEmailAddressId(String primaryEmailAddressId) {
         return this;
     }
 
-    public User withPrimaryEmailAddressId(JsonNullable<? extends String> primaryEmailAddressId) {
+    public User withPrimaryEmailAddressId(JsonNullable<String> primaryEmailAddressId) {
         Utils.checkNotNull(primaryEmailAddressId, "primaryEmailAddressId");
         this.primaryEmailAddressId = primaryEmailAddressId;
         return this;
@@ -688,7 +665,7 @@ public User withPrimaryPhoneNumberId(String primaryPhoneNumberId) {
         return this;
     }
 
-    public User withPrimaryPhoneNumberId(JsonNullable<? extends String> primaryPhoneNumberId) {
+    public User withPrimaryPhoneNumberId(JsonNullable<String> primaryPhoneNumberId) {
         Utils.checkNotNull(primaryPhoneNumberId, "primaryPhoneNumberId");
         this.primaryPhoneNumberId = primaryPhoneNumberId;
         return this;
@@ -700,7 +677,7 @@ public User withPrimaryWeb3WalletId(String primaryWeb3WalletId) {
         return this;
     }
 
-    public User withPrimaryWeb3WalletId(JsonNullable<? extends String> primaryWeb3WalletId) {
+    public User withPrimaryWeb3WalletId(JsonNullable<String> primaryWeb3WalletId) {
         Utils.checkNotNull(primaryWeb3WalletId, "primaryWeb3WalletId");
         this.primaryWeb3WalletId = primaryWeb3WalletId;
         return this;
@@ -712,7 +689,7 @@ public User withUsername(String username) {
         return this;
     }
 
-    public User withUsername(JsonNullable<? extends String> username) {
+    public User withUsername(JsonNullable<String> username) {
         Utils.checkNotNull(username, "username");
         this.username = username;
         return this;
@@ -724,7 +701,7 @@ public User withFirstName(String firstName) {
         return this;
     }
 
-    public User withFirstName(JsonNullable<? extends String> firstName) {
+    public User withFirstName(JsonNullable<String> firstName) {
         Utils.checkNotNull(firstName, "firstName");
         this.firstName = firstName;
         return this;
@@ -736,7 +713,7 @@ public User withLastName(String lastName) {
         return this;
     }
 
-    public User withLastName(JsonNullable<? extends String> lastName) {
+    public User withLastName(JsonNullable<String> lastName) {
         Utils.checkNotNull(lastName, "lastName");
         this.lastName = lastName;
         return this;
@@ -756,7 +733,7 @@ public User withProfileImageUrl(String profileImageUrl) {
      * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public User withProfileImageUrl(Optional<? extends String> profileImageUrl) {
+    public User withProfileImageUrl(Optional<String> profileImageUrl) {
         Utils.checkNotNull(profileImageUrl, "profileImageUrl");
         this.profileImageUrl = profileImageUrl;
         return this;
@@ -768,7 +745,7 @@ public User withImageUrl(String imageUrl) {
         return this;
     }
 
-    public User withImageUrl(Optional<? extends String> imageUrl) {
+    public User withImageUrl(Optional<String> imageUrl) {
         Utils.checkNotNull(imageUrl, "imageUrl");
         this.imageUrl = imageUrl;
         return this;
@@ -780,7 +757,7 @@ public User withHasImage(boolean hasImage) {
         return this;
     }
 
-    public User withHasImage(Optional<? extends Boolean> hasImage) {
+    public User withHasImage(Optional<Boolean> hasImage) {
         Utils.checkNotNull(hasImage, "hasImage");
         this.hasImage = hasImage;
         return this;
@@ -822,49 +799,49 @@ public User withUnsafeMetadata(Optional<? extends UnsafeMetadata> unsafeMetadata
         return this;
     }
 
-    public User withEmailAddresses(java.util.List<EmailAddress> emailAddresses) {
+    public User withEmailAddresses(List<EmailAddress> emailAddresses) {
         Utils.checkNotNull(emailAddresses, "emailAddresses");
         this.emailAddresses = Optional.ofNullable(emailAddresses);
         return this;
     }
 
-    public User withEmailAddresses(Optional<? extends java.util.List<EmailAddress>> emailAddresses) {
+    public User withEmailAddresses(Optional<? extends List<EmailAddress>> emailAddresses) {
         Utils.checkNotNull(emailAddresses, "emailAddresses");
         this.emailAddresses = emailAddresses;
         return this;
     }
 
-    public User withPhoneNumbers(java.util.List<PhoneNumber> phoneNumbers) {
+    public User withPhoneNumbers(List<PhoneNumber> phoneNumbers) {
         Utils.checkNotNull(phoneNumbers, "phoneNumbers");
         this.phoneNumbers = Optional.ofNullable(phoneNumbers);
         return this;
     }
 
-    public User withPhoneNumbers(Optional<? extends java.util.List<PhoneNumber>> phoneNumbers) {
+    public User withPhoneNumbers(Optional<? extends List<PhoneNumber>> phoneNumbers) {
         Utils.checkNotNull(phoneNumbers, "phoneNumbers");
         this.phoneNumbers = phoneNumbers;
         return this;
     }
 
-    public User withWeb3Wallets(java.util.List<Web3Wallet> web3Wallets) {
+    public User withWeb3Wallets(List<Web3Wallet> web3Wallets) {
         Utils.checkNotNull(web3Wallets, "web3Wallets");
         this.web3Wallets = Optional.ofNullable(web3Wallets);
         return this;
     }
 
-    public User withWeb3Wallets(Optional<? extends java.util.List<Web3Wallet>> web3Wallets) {
+    public User withWeb3Wallets(Optional<? extends List<Web3Wallet>> web3Wallets) {
         Utils.checkNotNull(web3Wallets, "web3Wallets");
         this.web3Wallets = web3Wallets;
         return this;
     }
 
-    public User withPasskeys(java.util.List<SchemasPasskey> passkeys) {
+    public User withPasskeys(List<SchemasPasskey> passkeys) {
         Utils.checkNotNull(passkeys, "passkeys");
         this.passkeys = Optional.ofNullable(passkeys);
         return this;
     }
 
-    public User withPasskeys(Optional<? extends java.util.List<SchemasPasskey>> passkeys) {
+    public User withPasskeys(Optional<? extends List<SchemasPasskey>> passkeys) {
         Utils.checkNotNull(passkeys, "passkeys");
         this.passkeys = passkeys;
         return this;
@@ -876,7 +853,7 @@ public User withPasswordEnabled(boolean passwordEnabled) {
         return this;
     }
 
-    public User withPasswordEnabled(Optional<? extends Boolean> passwordEnabled) {
+    public User withPasswordEnabled(Optional<Boolean> passwordEnabled) {
         Utils.checkNotNull(passwordEnabled, "passwordEnabled");
         this.passwordEnabled = passwordEnabled;
         return this;
@@ -888,7 +865,7 @@ public User withTwoFactorEnabled(boolean twoFactorEnabled) {
         return this;
     }
 
-    public User withTwoFactorEnabled(Optional<? extends Boolean> twoFactorEnabled) {
+    public User withTwoFactorEnabled(Optional<Boolean> twoFactorEnabled) {
         Utils.checkNotNull(twoFactorEnabled, "twoFactorEnabled");
         this.twoFactorEnabled = twoFactorEnabled;
         return this;
@@ -900,7 +877,7 @@ public User withTotpEnabled(boolean totpEnabled) {
         return this;
     }
 
-    public User withTotpEnabled(Optional<? extends Boolean> totpEnabled) {
+    public User withTotpEnabled(Optional<Boolean> totpEnabled) {
         Utils.checkNotNull(totpEnabled, "totpEnabled");
         this.totpEnabled = totpEnabled;
         return this;
@@ -912,7 +889,7 @@ public User withBackupCodeEnabled(boolean backupCodeEnabled) {
         return this;
     }
 
-    public User withBackupCodeEnabled(Optional<? extends Boolean> backupCodeEnabled) {
+    public User withBackupCodeEnabled(Optional<Boolean> backupCodeEnabled) {
         Utils.checkNotNull(backupCodeEnabled, "backupCodeEnabled");
         this.backupCodeEnabled = backupCodeEnabled;
         return this;
@@ -932,7 +909,7 @@ public User withMfaEnabledAt(long mfaEnabledAt) {
      * Unix timestamp of when MFA was last enabled for this user. It should be noted that this field is not nullified if MFA is disabled.
      * 
      */
-    public User withMfaEnabledAt(JsonNullable<? extends Long> mfaEnabledAt) {
+    public User withMfaEnabledAt(JsonNullable<Long> mfaEnabledAt) {
         Utils.checkNotNull(mfaEnabledAt, "mfaEnabledAt");
         this.mfaEnabledAt = mfaEnabledAt;
         return this;
@@ -952,31 +929,31 @@ public User withMfaDisabledAt(long mfaDisabledAt) {
      * Unix timestamp of when MFA was last disabled for this user. It should be noted that this field is not nullified if MFA is enabled again.
      * 
      */
-    public User withMfaDisabledAt(JsonNullable<? extends Long> mfaDisabledAt) {
+    public User withMfaDisabledAt(JsonNullable<Long> mfaDisabledAt) {
         Utils.checkNotNull(mfaDisabledAt, "mfaDisabledAt");
         this.mfaDisabledAt = mfaDisabledAt;
         return this;
     }
 
-    public User withExternalAccounts(java.util.List<ExternalAccounts> externalAccounts) {
+    public User withExternalAccounts(List<ExternalAccounts> externalAccounts) {
         Utils.checkNotNull(externalAccounts, "externalAccounts");
         this.externalAccounts = Optional.ofNullable(externalAccounts);
         return this;
     }
 
-    public User withExternalAccounts(Optional<? extends java.util.List<ExternalAccounts>> externalAccounts) {
+    public User withExternalAccounts(Optional<? extends List<ExternalAccounts>> externalAccounts) {
         Utils.checkNotNull(externalAccounts, "externalAccounts");
         this.externalAccounts = externalAccounts;
         return this;
     }
 
-    public User withSamlAccounts(java.util.List<SAMLAccount> samlAccounts) {
+    public User withSamlAccounts(List<SAMLAccount> samlAccounts) {
         Utils.checkNotNull(samlAccounts, "samlAccounts");
         this.samlAccounts = Optional.ofNullable(samlAccounts);
         return this;
     }
 
-    public User withSamlAccounts(Optional<? extends java.util.List<SAMLAccount>> samlAccounts) {
+    public User withSamlAccounts(Optional<? extends List<SAMLAccount>> samlAccounts) {
         Utils.checkNotNull(samlAccounts, "samlAccounts");
         this.samlAccounts = samlAccounts;
         return this;
@@ -996,7 +973,7 @@ public User withLastSignInAt(long lastSignInAt) {
      * Unix timestamp of last sign-in.
      * 
      */
-    public User withLastSignInAt(JsonNullable<? extends Long> lastSignInAt) {
+    public User withLastSignInAt(JsonNullable<Long> lastSignInAt) {
         Utils.checkNotNull(lastSignInAt, "lastSignInAt");
         this.lastSignInAt = lastSignInAt;
         return this;
@@ -1016,7 +993,7 @@ public User withBanned(boolean banned) {
      * Flag to denote whether user is banned or not.
      * 
      */
-    public User withBanned(Optional<? extends Boolean> banned) {
+    public User withBanned(Optional<Boolean> banned) {
         Utils.checkNotNull(banned, "banned");
         this.banned = banned;
         return this;
@@ -1036,7 +1013,7 @@ public User withLocked(boolean locked) {
      * Flag to denote whether user is currently locked, i.e. restricted from signing in or not.
      * 
      */
-    public User withLocked(Optional<? extends Boolean> locked) {
+    public User withLocked(Optional<Boolean> locked) {
         Utils.checkNotNull(locked, "locked");
         this.locked = locked;
         return this;
@@ -1056,7 +1033,7 @@ public User withLockoutExpiresInSeconds(long lockoutExpiresInSeconds) {
      * The number of seconds remaining until the lockout period expires for a locked user. A null value for a locked user indicates that lockout never expires.
      * 
      */
-    public User withLockoutExpiresInSeconds(JsonNullable<? extends Long> lockoutExpiresInSeconds) {
+    public User withLockoutExpiresInSeconds(JsonNullable<Long> lockoutExpiresInSeconds) {
         Utils.checkNotNull(lockoutExpiresInSeconds, "lockoutExpiresInSeconds");
         this.lockoutExpiresInSeconds = lockoutExpiresInSeconds;
         return this;
@@ -1076,7 +1053,7 @@ public User withVerificationAttemptsRemaining(long verificationAttemptsRemaining
      * The number of verification attempts remaining until the user is locked. Null if account lockout is not enabled. Note: if a user is locked explicitly via the Backend API, they may still have verification attempts remaining.
      * 
      */
-    public User withVerificationAttemptsRemaining(JsonNullable<? extends Long> verificationAttemptsRemaining) {
+    public User withVerificationAttemptsRemaining(JsonNullable<Long> verificationAttemptsRemaining) {
         Utils.checkNotNull(verificationAttemptsRemaining, "verificationAttemptsRemaining");
         this.verificationAttemptsRemaining = verificationAttemptsRemaining;
         return this;
@@ -1096,7 +1073,7 @@ public User withUpdatedAt(long updatedAt) {
      * Unix timestamp of last update.
      * 
      */
-    public User withUpdatedAt(Optional<? extends Long> updatedAt) {
+    public User withUpdatedAt(Optional<Long> updatedAt) {
         Utils.checkNotNull(updatedAt, "updatedAt");
         this.updatedAt = updatedAt;
         return this;
@@ -1116,7 +1093,7 @@ public User withCreatedAt(long createdAt) {
      * Unix timestamp of creation.
      * 
      */
-    public User withCreatedAt(Optional<? extends Long> createdAt) {
+    public User withCreatedAt(Optional<Long> createdAt) {
         Utils.checkNotNull(createdAt, "createdAt");
         this.createdAt = createdAt;
         return this;
@@ -1136,7 +1113,7 @@ public User withDeleteSelfEnabled(boolean deleteSelfEnabled) {
      * If enabled, user can delete themselves via FAPI.
      * 
      */
-    public User withDeleteSelfEnabled(Optional<? extends Boolean> deleteSelfEnabled) {
+    public User withDeleteSelfEnabled(Optional<Boolean> deleteSelfEnabled) {
         Utils.checkNotNull(deleteSelfEnabled, "deleteSelfEnabled");
         this.deleteSelfEnabled = deleteSelfEnabled;
         return this;
@@ -1156,7 +1133,7 @@ public User withCreateOrganizationEnabled(boolean createOrganizationEnabled) {
      * If enabled, user can create organizations via FAPI.
      * 
      */
-    public User withCreateOrganizationEnabled(Optional<? extends Boolean> createOrganizationEnabled) {
+    public User withCreateOrganizationEnabled(Optional<Boolean> createOrganizationEnabled) {
         Utils.checkNotNull(createOrganizationEnabled, "createOrganizationEnabled");
         this.createOrganizationEnabled = createOrganizationEnabled;
         return this;
@@ -1176,7 +1153,7 @@ public User withLastActiveAt(long lastActiveAt) {
      * Unix timestamp of the latest session activity, with day precision.
      * 
      */
-    public User withLastActiveAt(JsonNullable<? extends Long> lastActiveAt) {
+    public User withLastActiveAt(JsonNullable<Long> lastActiveAt) {
         Utils.checkNotNull(lastActiveAt, "lastActiveAt");
         this.lastActiveAt = lastActiveAt;
         return this;
@@ -1192,48 +1169,48 @@ public boolean equals(java.lang.Object o) {
         }
         User other = (User) o;
         return 
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.externalId, other.externalId) &&
-            java.util.Objects.deepEquals(this.primaryEmailAddressId, other.primaryEmailAddressId) &&
-            java.util.Objects.deepEquals(this.primaryPhoneNumberId, other.primaryPhoneNumberId) &&
-            java.util.Objects.deepEquals(this.primaryWeb3WalletId, other.primaryWeb3WalletId) &&
-            java.util.Objects.deepEquals(this.username, other.username) &&
-            java.util.Objects.deepEquals(this.firstName, other.firstName) &&
-            java.util.Objects.deepEquals(this.lastName, other.lastName) &&
-            java.util.Objects.deepEquals(this.profileImageUrl, other.profileImageUrl) &&
-            java.util.Objects.deepEquals(this.imageUrl, other.imageUrl) &&
-            java.util.Objects.deepEquals(this.hasImage, other.hasImage) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
-            java.util.Objects.deepEquals(this.unsafeMetadata, other.unsafeMetadata) &&
-            java.util.Objects.deepEquals(this.emailAddresses, other.emailAddresses) &&
-            java.util.Objects.deepEquals(this.phoneNumbers, other.phoneNumbers) &&
-            java.util.Objects.deepEquals(this.web3Wallets, other.web3Wallets) &&
-            java.util.Objects.deepEquals(this.passkeys, other.passkeys) &&
-            java.util.Objects.deepEquals(this.passwordEnabled, other.passwordEnabled) &&
-            java.util.Objects.deepEquals(this.twoFactorEnabled, other.twoFactorEnabled) &&
-            java.util.Objects.deepEquals(this.totpEnabled, other.totpEnabled) &&
-            java.util.Objects.deepEquals(this.backupCodeEnabled, other.backupCodeEnabled) &&
-            java.util.Objects.deepEquals(this.mfaEnabledAt, other.mfaEnabledAt) &&
-            java.util.Objects.deepEquals(this.mfaDisabledAt, other.mfaDisabledAt) &&
-            java.util.Objects.deepEquals(this.externalAccounts, other.externalAccounts) &&
-            java.util.Objects.deepEquals(this.samlAccounts, other.samlAccounts) &&
-            java.util.Objects.deepEquals(this.lastSignInAt, other.lastSignInAt) &&
-            java.util.Objects.deepEquals(this.banned, other.banned) &&
-            java.util.Objects.deepEquals(this.locked, other.locked) &&
-            java.util.Objects.deepEquals(this.lockoutExpiresInSeconds, other.lockoutExpiresInSeconds) &&
-            java.util.Objects.deepEquals(this.verificationAttemptsRemaining, other.verificationAttemptsRemaining) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.deleteSelfEnabled, other.deleteSelfEnabled) &&
-            java.util.Objects.deepEquals(this.createOrganizationEnabled, other.createOrganizationEnabled) &&
-            java.util.Objects.deepEquals(this.lastActiveAt, other.lastActiveAt);
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.externalId, other.externalId) &&
+            Objects.deepEquals(this.primaryEmailAddressId, other.primaryEmailAddressId) &&
+            Objects.deepEquals(this.primaryPhoneNumberId, other.primaryPhoneNumberId) &&
+            Objects.deepEquals(this.primaryWeb3WalletId, other.primaryWeb3WalletId) &&
+            Objects.deepEquals(this.username, other.username) &&
+            Objects.deepEquals(this.firstName, other.firstName) &&
+            Objects.deepEquals(this.lastName, other.lastName) &&
+            Objects.deepEquals(this.profileImageUrl, other.profileImageUrl) &&
+            Objects.deepEquals(this.imageUrl, other.imageUrl) &&
+            Objects.deepEquals(this.hasImage, other.hasImage) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
+            Objects.deepEquals(this.unsafeMetadata, other.unsafeMetadata) &&
+            Objects.deepEquals(this.emailAddresses, other.emailAddresses) &&
+            Objects.deepEquals(this.phoneNumbers, other.phoneNumbers) &&
+            Objects.deepEquals(this.web3Wallets, other.web3Wallets) &&
+            Objects.deepEquals(this.passkeys, other.passkeys) &&
+            Objects.deepEquals(this.passwordEnabled, other.passwordEnabled) &&
+            Objects.deepEquals(this.twoFactorEnabled, other.twoFactorEnabled) &&
+            Objects.deepEquals(this.totpEnabled, other.totpEnabled) &&
+            Objects.deepEquals(this.backupCodeEnabled, other.backupCodeEnabled) &&
+            Objects.deepEquals(this.mfaEnabledAt, other.mfaEnabledAt) &&
+            Objects.deepEquals(this.mfaDisabledAt, other.mfaDisabledAt) &&
+            Objects.deepEquals(this.externalAccounts, other.externalAccounts) &&
+            Objects.deepEquals(this.samlAccounts, other.samlAccounts) &&
+            Objects.deepEquals(this.lastSignInAt, other.lastSignInAt) &&
+            Objects.deepEquals(this.banned, other.banned) &&
+            Objects.deepEquals(this.locked, other.locked) &&
+            Objects.deepEquals(this.lockoutExpiresInSeconds, other.lockoutExpiresInSeconds) &&
+            Objects.deepEquals(this.verificationAttemptsRemaining, other.verificationAttemptsRemaining) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.deleteSelfEnabled, other.deleteSelfEnabled) &&
+            Objects.deepEquals(this.createOrganizationEnabled, other.createOrganizationEnabled) &&
+            Objects.deepEquals(this.lastActiveAt, other.lastActiveAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             id,
             object,
             externalId,
@@ -1317,30 +1294,30 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> id = Optional.empty();
+        private Optional<String> id = Optional.empty();
  
         private Optional<? extends UserObject> object = Optional.empty();
  
-        private JsonNullable<? extends String> externalId = JsonNullable.undefined();
+        private JsonNullable<String> externalId = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> primaryEmailAddressId = JsonNullable.undefined();
+        private JsonNullable<String> primaryEmailAddressId = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> primaryPhoneNumberId = JsonNullable.undefined();
+        private JsonNullable<String> primaryPhoneNumberId = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> primaryWeb3WalletId = JsonNullable.undefined();
+        private JsonNullable<String> primaryWeb3WalletId = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> username = JsonNullable.undefined();
+        private JsonNullable<String> username = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> firstName = JsonNullable.undefined();
+        private JsonNullable<String> firstName = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> lastName = JsonNullable.undefined();
+        private JsonNullable<String> lastName = JsonNullable.undefined();
  
         @Deprecated
-        private Optional<? extends String> profileImageUrl = Optional.empty();
+        private Optional<String> profileImageUrl = Optional.empty();
  
-        private Optional<? extends String> imageUrl = Optional.empty();
+        private Optional<String> imageUrl = Optional.empty();
  
-        private Optional<? extends Boolean> hasImage = Optional.empty();
+        private Optional<Boolean> hasImage = Optional.empty();
  
         private Optional<? extends PublicMetadata> publicMetadata = Optional.empty();
  
@@ -1348,49 +1325,49 @@ public final static class Builder {
  
         private Optional<? extends UnsafeMetadata> unsafeMetadata = Optional.empty();
  
-        private Optional<? extends java.util.List<EmailAddress>> emailAddresses = Optional.empty();
+        private Optional<? extends List<EmailAddress>> emailAddresses = Optional.empty();
  
-        private Optional<? extends java.util.List<PhoneNumber>> phoneNumbers = Optional.empty();
+        private Optional<? extends List<PhoneNumber>> phoneNumbers = Optional.empty();
  
-        private Optional<? extends java.util.List<Web3Wallet>> web3Wallets = Optional.empty();
+        private Optional<? extends List<Web3Wallet>> web3Wallets = Optional.empty();
  
-        private Optional<? extends java.util.List<SchemasPasskey>> passkeys = Optional.empty();
+        private Optional<? extends List<SchemasPasskey>> passkeys = Optional.empty();
  
-        private Optional<? extends Boolean> passwordEnabled = Optional.empty();
+        private Optional<Boolean> passwordEnabled = Optional.empty();
  
-        private Optional<? extends Boolean> twoFactorEnabled = Optional.empty();
+        private Optional<Boolean> twoFactorEnabled = Optional.empty();
  
-        private Optional<? extends Boolean> totpEnabled = Optional.empty();
+        private Optional<Boolean> totpEnabled = Optional.empty();
  
-        private Optional<? extends Boolean> backupCodeEnabled = Optional.empty();
+        private Optional<Boolean> backupCodeEnabled = Optional.empty();
  
-        private JsonNullable<? extends Long> mfaEnabledAt = JsonNullable.undefined();
+        private JsonNullable<Long> mfaEnabledAt = JsonNullable.undefined();
  
-        private JsonNullable<? extends Long> mfaDisabledAt = JsonNullable.undefined();
+        private JsonNullable<Long> mfaDisabledAt = JsonNullable.undefined();
  
-        private Optional<? extends java.util.List<ExternalAccounts>> externalAccounts = Optional.empty();
+        private Optional<? extends List<ExternalAccounts>> externalAccounts = Optional.empty();
  
-        private Optional<? extends java.util.List<SAMLAccount>> samlAccounts = Optional.empty();
+        private Optional<? extends List<SAMLAccount>> samlAccounts = Optional.empty();
  
-        private JsonNullable<? extends Long> lastSignInAt = JsonNullable.undefined();
+        private JsonNullable<Long> lastSignInAt = JsonNullable.undefined();
  
-        private Optional<? extends Boolean> banned = Optional.empty();
+        private Optional<Boolean> banned = Optional.empty();
  
-        private Optional<? extends Boolean> locked = Optional.empty();
+        private Optional<Boolean> locked = Optional.empty();
  
-        private JsonNullable<? extends Long> lockoutExpiresInSeconds = JsonNullable.undefined();
+        private JsonNullable<Long> lockoutExpiresInSeconds = JsonNullable.undefined();
  
-        private JsonNullable<? extends Long> verificationAttemptsRemaining = JsonNullable.undefined();
+        private JsonNullable<Long> verificationAttemptsRemaining = JsonNullable.undefined();
  
-        private Optional<? extends Long> updatedAt = Optional.empty();
+        private Optional<Long> updatedAt = Optional.empty();
  
-        private Optional<? extends Long> createdAt = Optional.empty();
+        private Optional<Long> createdAt = Optional.empty();
  
-        private Optional<? extends Boolean> deleteSelfEnabled = Optional.empty();
+        private Optional<Boolean> deleteSelfEnabled = Optional.empty();
  
-        private Optional<? extends Boolean> createOrganizationEnabled = Optional.empty();
+        private Optional<Boolean> createOrganizationEnabled = Optional.empty();
  
-        private JsonNullable<? extends Long> lastActiveAt = JsonNullable.undefined();  
+        private JsonNullable<Long> lastActiveAt = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -1402,7 +1379,7 @@ public Builder id(String id) {
             return this;
         }
 
-        public Builder id(Optional<? extends String> id) {
+        public Builder id(Optional<String> id) {
             Utils.checkNotNull(id, "id");
             this.id = id;
             return this;
@@ -1434,7 +1411,7 @@ public Builder externalId(String externalId) {
             return this;
         }
 
-        public Builder externalId(JsonNullable<? extends String> externalId) {
+        public Builder externalId(JsonNullable<String> externalId) {
             Utils.checkNotNull(externalId, "externalId");
             this.externalId = externalId;
             return this;
@@ -1446,7 +1423,7 @@ public Builder primaryEmailAddressId(String primaryEmailAddressId) {
             return this;
         }
 
-        public Builder primaryEmailAddressId(JsonNullable<? extends String> primaryEmailAddressId) {
+        public Builder primaryEmailAddressId(JsonNullable<String> primaryEmailAddressId) {
             Utils.checkNotNull(primaryEmailAddressId, "primaryEmailAddressId");
             this.primaryEmailAddressId = primaryEmailAddressId;
             return this;
@@ -1458,7 +1435,7 @@ public Builder primaryPhoneNumberId(String primaryPhoneNumberId) {
             return this;
         }
 
-        public Builder primaryPhoneNumberId(JsonNullable<? extends String> primaryPhoneNumberId) {
+        public Builder primaryPhoneNumberId(JsonNullable<String> primaryPhoneNumberId) {
             Utils.checkNotNull(primaryPhoneNumberId, "primaryPhoneNumberId");
             this.primaryPhoneNumberId = primaryPhoneNumberId;
             return this;
@@ -1470,7 +1447,7 @@ public Builder primaryWeb3WalletId(String primaryWeb3WalletId) {
             return this;
         }
 
-        public Builder primaryWeb3WalletId(JsonNullable<? extends String> primaryWeb3WalletId) {
+        public Builder primaryWeb3WalletId(JsonNullable<String> primaryWeb3WalletId) {
             Utils.checkNotNull(primaryWeb3WalletId, "primaryWeb3WalletId");
             this.primaryWeb3WalletId = primaryWeb3WalletId;
             return this;
@@ -1482,7 +1459,7 @@ public Builder username(String username) {
             return this;
         }
 
-        public Builder username(JsonNullable<? extends String> username) {
+        public Builder username(JsonNullable<String> username) {
             Utils.checkNotNull(username, "username");
             this.username = username;
             return this;
@@ -1494,7 +1471,7 @@ public Builder firstName(String firstName) {
             return this;
         }
 
-        public Builder firstName(JsonNullable<? extends String> firstName) {
+        public Builder firstName(JsonNullable<String> firstName) {
             Utils.checkNotNull(firstName, "firstName");
             this.firstName = firstName;
             return this;
@@ -1506,7 +1483,7 @@ public Builder lastName(String lastName) {
             return this;
         }
 
-        public Builder lastName(JsonNullable<? extends String> lastName) {
+        public Builder lastName(JsonNullable<String> lastName) {
             Utils.checkNotNull(lastName, "lastName");
             this.lastName = lastName;
             return this;
@@ -1526,7 +1503,7 @@ public Builder profileImageUrl(String profileImageUrl) {
          * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
          */
         @Deprecated
-        public Builder profileImageUrl(Optional<? extends String> profileImageUrl) {
+        public Builder profileImageUrl(Optional<String> profileImageUrl) {
             Utils.checkNotNull(profileImageUrl, "profileImageUrl");
             this.profileImageUrl = profileImageUrl;
             return this;
@@ -1538,7 +1515,7 @@ public Builder imageUrl(String imageUrl) {
             return this;
         }
 
-        public Builder imageUrl(Optional<? extends String> imageUrl) {
+        public Builder imageUrl(Optional<String> imageUrl) {
             Utils.checkNotNull(imageUrl, "imageUrl");
             this.imageUrl = imageUrl;
             return this;
@@ -1550,7 +1527,7 @@ public Builder hasImage(boolean hasImage) {
             return this;
         }
 
-        public Builder hasImage(Optional<? extends Boolean> hasImage) {
+        public Builder hasImage(Optional<Boolean> hasImage) {
             Utils.checkNotNull(hasImage, "hasImage");
             this.hasImage = hasImage;
             return this;
@@ -1592,49 +1569,49 @@ public Builder unsafeMetadata(Optional<? extends UnsafeMetadata> unsafeMetadata)
             return this;
         }
 
-        public Builder emailAddresses(java.util.List<EmailAddress> emailAddresses) {
+        public Builder emailAddresses(List<EmailAddress> emailAddresses) {
             Utils.checkNotNull(emailAddresses, "emailAddresses");
             this.emailAddresses = Optional.ofNullable(emailAddresses);
             return this;
         }
 
-        public Builder emailAddresses(Optional<? extends java.util.List<EmailAddress>> emailAddresses) {
+        public Builder emailAddresses(Optional<? extends List<EmailAddress>> emailAddresses) {
             Utils.checkNotNull(emailAddresses, "emailAddresses");
             this.emailAddresses = emailAddresses;
             return this;
         }
 
-        public Builder phoneNumbers(java.util.List<PhoneNumber> phoneNumbers) {
+        public Builder phoneNumbers(List<PhoneNumber> phoneNumbers) {
             Utils.checkNotNull(phoneNumbers, "phoneNumbers");
             this.phoneNumbers = Optional.ofNullable(phoneNumbers);
             return this;
         }
 
-        public Builder phoneNumbers(Optional<? extends java.util.List<PhoneNumber>> phoneNumbers) {
+        public Builder phoneNumbers(Optional<? extends List<PhoneNumber>> phoneNumbers) {
             Utils.checkNotNull(phoneNumbers, "phoneNumbers");
             this.phoneNumbers = phoneNumbers;
             return this;
         }
 
-        public Builder web3Wallets(java.util.List<Web3Wallet> web3Wallets) {
+        public Builder web3Wallets(List<Web3Wallet> web3Wallets) {
             Utils.checkNotNull(web3Wallets, "web3Wallets");
             this.web3Wallets = Optional.ofNullable(web3Wallets);
             return this;
         }
 
-        public Builder web3Wallets(Optional<? extends java.util.List<Web3Wallet>> web3Wallets) {
+        public Builder web3Wallets(Optional<? extends List<Web3Wallet>> web3Wallets) {
             Utils.checkNotNull(web3Wallets, "web3Wallets");
             this.web3Wallets = web3Wallets;
             return this;
         }
 
-        public Builder passkeys(java.util.List<SchemasPasskey> passkeys) {
+        public Builder passkeys(List<SchemasPasskey> passkeys) {
             Utils.checkNotNull(passkeys, "passkeys");
             this.passkeys = Optional.ofNullable(passkeys);
             return this;
         }
 
-        public Builder passkeys(Optional<? extends java.util.List<SchemasPasskey>> passkeys) {
+        public Builder passkeys(Optional<? extends List<SchemasPasskey>> passkeys) {
             Utils.checkNotNull(passkeys, "passkeys");
             this.passkeys = passkeys;
             return this;
@@ -1646,7 +1623,7 @@ public Builder passwordEnabled(boolean passwordEnabled) {
             return this;
         }
 
-        public Builder passwordEnabled(Optional<? extends Boolean> passwordEnabled) {
+        public Builder passwordEnabled(Optional<Boolean> passwordEnabled) {
             Utils.checkNotNull(passwordEnabled, "passwordEnabled");
             this.passwordEnabled = passwordEnabled;
             return this;
@@ -1658,7 +1635,7 @@ public Builder twoFactorEnabled(boolean twoFactorEnabled) {
             return this;
         }
 
-        public Builder twoFactorEnabled(Optional<? extends Boolean> twoFactorEnabled) {
+        public Builder twoFactorEnabled(Optional<Boolean> twoFactorEnabled) {
             Utils.checkNotNull(twoFactorEnabled, "twoFactorEnabled");
             this.twoFactorEnabled = twoFactorEnabled;
             return this;
@@ -1670,7 +1647,7 @@ public Builder totpEnabled(boolean totpEnabled) {
             return this;
         }
 
-        public Builder totpEnabled(Optional<? extends Boolean> totpEnabled) {
+        public Builder totpEnabled(Optional<Boolean> totpEnabled) {
             Utils.checkNotNull(totpEnabled, "totpEnabled");
             this.totpEnabled = totpEnabled;
             return this;
@@ -1682,7 +1659,7 @@ public Builder backupCodeEnabled(boolean backupCodeEnabled) {
             return this;
         }
 
-        public Builder backupCodeEnabled(Optional<? extends Boolean> backupCodeEnabled) {
+        public Builder backupCodeEnabled(Optional<Boolean> backupCodeEnabled) {
             Utils.checkNotNull(backupCodeEnabled, "backupCodeEnabled");
             this.backupCodeEnabled = backupCodeEnabled;
             return this;
@@ -1702,7 +1679,7 @@ public Builder mfaEnabledAt(long mfaEnabledAt) {
          * Unix timestamp of when MFA was last enabled for this user. It should be noted that this field is not nullified if MFA is disabled.
          * 
          */
-        public Builder mfaEnabledAt(JsonNullable<? extends Long> mfaEnabledAt) {
+        public Builder mfaEnabledAt(JsonNullable<Long> mfaEnabledAt) {
             Utils.checkNotNull(mfaEnabledAt, "mfaEnabledAt");
             this.mfaEnabledAt = mfaEnabledAt;
             return this;
@@ -1722,31 +1699,31 @@ public Builder mfaDisabledAt(long mfaDisabledAt) {
          * Unix timestamp of when MFA was last disabled for this user. It should be noted that this field is not nullified if MFA is enabled again.
          * 
          */
-        public Builder mfaDisabledAt(JsonNullable<? extends Long> mfaDisabledAt) {
+        public Builder mfaDisabledAt(JsonNullable<Long> mfaDisabledAt) {
             Utils.checkNotNull(mfaDisabledAt, "mfaDisabledAt");
             this.mfaDisabledAt = mfaDisabledAt;
             return this;
         }
 
-        public Builder externalAccounts(java.util.List<ExternalAccounts> externalAccounts) {
+        public Builder externalAccounts(List<ExternalAccounts> externalAccounts) {
             Utils.checkNotNull(externalAccounts, "externalAccounts");
             this.externalAccounts = Optional.ofNullable(externalAccounts);
             return this;
         }
 
-        public Builder externalAccounts(Optional<? extends java.util.List<ExternalAccounts>> externalAccounts) {
+        public Builder externalAccounts(Optional<? extends List<ExternalAccounts>> externalAccounts) {
             Utils.checkNotNull(externalAccounts, "externalAccounts");
             this.externalAccounts = externalAccounts;
             return this;
         }
 
-        public Builder samlAccounts(java.util.List<SAMLAccount> samlAccounts) {
+        public Builder samlAccounts(List<SAMLAccount> samlAccounts) {
             Utils.checkNotNull(samlAccounts, "samlAccounts");
             this.samlAccounts = Optional.ofNullable(samlAccounts);
             return this;
         }
 
-        public Builder samlAccounts(Optional<? extends java.util.List<SAMLAccount>> samlAccounts) {
+        public Builder samlAccounts(Optional<? extends List<SAMLAccount>> samlAccounts) {
             Utils.checkNotNull(samlAccounts, "samlAccounts");
             this.samlAccounts = samlAccounts;
             return this;
@@ -1766,7 +1743,7 @@ public Builder lastSignInAt(long lastSignInAt) {
          * Unix timestamp of last sign-in.
          * 
          */
-        public Builder lastSignInAt(JsonNullable<? extends Long> lastSignInAt) {
+        public Builder lastSignInAt(JsonNullable<Long> lastSignInAt) {
             Utils.checkNotNull(lastSignInAt, "lastSignInAt");
             this.lastSignInAt = lastSignInAt;
             return this;
@@ -1786,7 +1763,7 @@ public Builder banned(boolean banned) {
          * Flag to denote whether user is banned or not.
          * 
          */
-        public Builder banned(Optional<? extends Boolean> banned) {
+        public Builder banned(Optional<Boolean> banned) {
             Utils.checkNotNull(banned, "banned");
             this.banned = banned;
             return this;
@@ -1806,7 +1783,7 @@ public Builder locked(boolean locked) {
          * Flag to denote whether user is currently locked, i.e. restricted from signing in or not.
          * 
          */
-        public Builder locked(Optional<? extends Boolean> locked) {
+        public Builder locked(Optional<Boolean> locked) {
             Utils.checkNotNull(locked, "locked");
             this.locked = locked;
             return this;
@@ -1826,7 +1803,7 @@ public Builder lockoutExpiresInSeconds(long lockoutExpiresInSeconds) {
          * The number of seconds remaining until the lockout period expires for a locked user. A null value for a locked user indicates that lockout never expires.
          * 
          */
-        public Builder lockoutExpiresInSeconds(JsonNullable<? extends Long> lockoutExpiresInSeconds) {
+        public Builder lockoutExpiresInSeconds(JsonNullable<Long> lockoutExpiresInSeconds) {
             Utils.checkNotNull(lockoutExpiresInSeconds, "lockoutExpiresInSeconds");
             this.lockoutExpiresInSeconds = lockoutExpiresInSeconds;
             return this;
@@ -1846,7 +1823,7 @@ public Builder verificationAttemptsRemaining(long verificationAttemptsRemaining)
          * The number of verification attempts remaining until the user is locked. Null if account lockout is not enabled. Note: if a user is locked explicitly via the Backend API, they may still have verification attempts remaining.
          * 
          */
-        public Builder verificationAttemptsRemaining(JsonNullable<? extends Long> verificationAttemptsRemaining) {
+        public Builder verificationAttemptsRemaining(JsonNullable<Long> verificationAttemptsRemaining) {
             Utils.checkNotNull(verificationAttemptsRemaining, "verificationAttemptsRemaining");
             this.verificationAttemptsRemaining = verificationAttemptsRemaining;
             return this;
@@ -1866,7 +1843,7 @@ public Builder updatedAt(long updatedAt) {
          * Unix timestamp of last update.
          * 
          */
-        public Builder updatedAt(Optional<? extends Long> updatedAt) {
+        public Builder updatedAt(Optional<Long> updatedAt) {
             Utils.checkNotNull(updatedAt, "updatedAt");
             this.updatedAt = updatedAt;
             return this;
@@ -1886,7 +1863,7 @@ public Builder createdAt(long createdAt) {
          * Unix timestamp of creation.
          * 
          */
-        public Builder createdAt(Optional<? extends Long> createdAt) {
+        public Builder createdAt(Optional<Long> createdAt) {
             Utils.checkNotNull(createdAt, "createdAt");
             this.createdAt = createdAt;
             return this;
@@ -1906,7 +1883,7 @@ public Builder deleteSelfEnabled(boolean deleteSelfEnabled) {
          * If enabled, user can delete themselves via FAPI.
          * 
          */
-        public Builder deleteSelfEnabled(Optional<? extends Boolean> deleteSelfEnabled) {
+        public Builder deleteSelfEnabled(Optional<Boolean> deleteSelfEnabled) {
             Utils.checkNotNull(deleteSelfEnabled, "deleteSelfEnabled");
             this.deleteSelfEnabled = deleteSelfEnabled;
             return this;
@@ -1926,7 +1903,7 @@ public Builder createOrganizationEnabled(boolean createOrganizationEnabled) {
          * If enabled, user can create organizations via FAPI.
          * 
          */
-        public Builder createOrganizationEnabled(Optional<? extends Boolean> createOrganizationEnabled) {
+        public Builder createOrganizationEnabled(Optional<Boolean> createOrganizationEnabled) {
             Utils.checkNotNull(createOrganizationEnabled, "createOrganizationEnabled");
             this.createOrganizationEnabled = createOrganizationEnabled;
             return this;
@@ -1946,7 +1923,7 @@ public Builder lastActiveAt(long lastActiveAt) {
          * Unix timestamp of the latest session activity, with day precision.
          * 
          */
-        public Builder lastActiveAt(JsonNullable<? extends Long> lastActiveAt) {
+        public Builder lastActiveAt(JsonNullable<Long> lastActiveAt) {
             Utils.checkNotNull(lastActiveAt, "lastActiveAt");
             this.lastActiveAt = lastActiveAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/UserObject.java b/src/main/java/com/clerk/backend_api/models/components/UserObject.java
index 40e45f1..331b758 100644
--- a/src/main/java/com/clerk/backend_api/models/components/UserObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/UserObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * UserObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/Verification.java b/src/main/java/com/clerk/backend_api/models/components/Verification.java
index 8bbb00e..837f309 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Verification.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Verification.java
@@ -4,28 +4,25 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
 
-import java.time.OffsetDateTime;
-import java.time.LocalDate;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.clerk.backend_api.utils.OneOfDeserializer;
 import com.clerk.backend_api.utils.TypedObject;
 import com.clerk.backend_api.utils.Utils.JsonShape;
+import com.clerk.backend_api.utils.Utils.TypeReferenceWithShape;
+import com.clerk.backend_api.utils.Utils;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 
 
 @JsonDeserialize(using = Verification._Deserializer.class)
 public class Verification {
 
-    @com.fasterxml.jackson.annotation.JsonValue
+    @JsonValue
     private TypedObject value;
     
     private Verification(TypedObject value) {
@@ -50,9 +47,9 @@ public static Verification of(Oauth value) {
     /**
      * Returns an instance of one of these types:
      * <ul>
-     * <li>{@code Otp}</li>
-     * <li>{@code Admin}</li>
-     * <li>{@code Oauth}</li>
+     * <li>{@code com.clerk.backend_api.models.components.Otp}</li>
+     * <li>{@code com.clerk.backend_api.models.components.Admin}</li>
+     * <li>{@code com.clerk.backend_api.models.components.Oauth}</li>
      * </ul>
      * 
      * <p>Use {@code instanceof} to determine what type is returned. For example:
@@ -79,22 +76,22 @@ public boolean equals(java.lang.Object o) {
             return false;
         }
         Verification other = (Verification) o;
-        return java.util.Objects.deepEquals(this.value.value(), other.value.value()); 
+        return Objects.deepEquals(this.value.value(), other.value.value()); 
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(value.value());
+        return Objects.hash(value.value());
     }
     
     @SuppressWarnings("serial")
-    public static final class _Deserializer extends com.clerk.backend_api.utils.OneOfDeserializer<Verification> {
+    public static final class _Deserializer extends OneOfDeserializer<Verification> {
 
         public _Deserializer() {
             super(Verification.class,
-                  Utils.TypeReferenceWithShape.of(new TypeReference<Otp>() {}, Utils.JsonShape.DEFAULT),
-                  Utils.TypeReferenceWithShape.of(new TypeReference<Admin>() {}, Utils.JsonShape.DEFAULT),
-                  Utils.TypeReferenceWithShape.of(new TypeReference<Oauth>() {}, Utils.JsonShape.DEFAULT));
+                  TypeReferenceWithShape.of(new TypeReference<com.clerk.backend_api.models.components.Otp>() {}, JsonShape.DEFAULT),
+                  TypeReferenceWithShape.of(new TypeReference<com.clerk.backend_api.models.components.Admin>() {}, JsonShape.DEFAULT),
+                  TypeReferenceWithShape.of(new TypeReference<com.clerk.backend_api.models.components.Oauth>() {}, JsonShape.DEFAULT));
         }
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/VerificationAdmin.java b/src/main/java/com/clerk/backend_api/models/components/VerificationAdmin.java
index 85b280e..d9614a6 100644
--- a/src/main/java/com/clerk/backend_api/models/components/VerificationAdmin.java
+++ b/src/main/java/com/clerk/backend_api/models/components/VerificationAdmin.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class VerificationAdmin {
 
     @JsonProperty("status")
@@ -28,18 +28,18 @@ public class VerificationAdmin {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("attempts")
-    private JsonNullable<? extends Long> attempts;
+    private JsonNullable<Long> attempts;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("expire_at")
-    private JsonNullable<? extends Long> expireAt;
+    private JsonNullable<Long> expireAt;
 
     @JsonCreator
     public VerificationAdmin(
             @JsonProperty("status") AdminVerificationPhoneNumberStatus status,
             @JsonProperty("strategy") AdminVerificationStrategy strategy,
-            @JsonProperty("attempts") JsonNullable<? extends Long> attempts,
-            @JsonProperty("expire_at") JsonNullable<? extends Long> expireAt) {
+            @JsonProperty("attempts") JsonNullable<Long> attempts,
+            @JsonProperty("expire_at") JsonNullable<Long> expireAt) {
         Utils.checkNotNull(status, "status");
         Utils.checkNotNull(strategy, "strategy");
         Utils.checkNotNull(attempts, "attempts");
@@ -66,16 +66,14 @@ public AdminVerificationStrategy strategy() {
         return strategy;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> attempts() {
-        return (JsonNullable<Long>) attempts;
+        return attempts;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> expireAt() {
-        return (JsonNullable<Long>) expireAt;
+        return expireAt;
     }
 
     public final static Builder builder() {
@@ -100,7 +98,7 @@ public VerificationAdmin withAttempts(long attempts) {
         return this;
     }
 
-    public VerificationAdmin withAttempts(JsonNullable<? extends Long> attempts) {
+    public VerificationAdmin withAttempts(JsonNullable<Long> attempts) {
         Utils.checkNotNull(attempts, "attempts");
         this.attempts = attempts;
         return this;
@@ -112,7 +110,7 @@ public VerificationAdmin withExpireAt(long expireAt) {
         return this;
     }
 
-    public VerificationAdmin withExpireAt(JsonNullable<? extends Long> expireAt) {
+    public VerificationAdmin withExpireAt(JsonNullable<Long> expireAt) {
         Utils.checkNotNull(expireAt, "expireAt");
         this.expireAt = expireAt;
         return this;
@@ -128,15 +126,15 @@ public boolean equals(java.lang.Object o) {
         }
         VerificationAdmin other = (VerificationAdmin) o;
         return 
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.strategy, other.strategy) &&
-            java.util.Objects.deepEquals(this.attempts, other.attempts) &&
-            java.util.Objects.deepEquals(this.expireAt, other.expireAt);
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.strategy, other.strategy) &&
+            Objects.deepEquals(this.attempts, other.attempts) &&
+            Objects.deepEquals(this.expireAt, other.expireAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             status,
             strategy,
             attempts,
@@ -158,9 +156,9 @@ public final static class Builder {
  
         private AdminVerificationStrategy strategy;
  
-        private JsonNullable<? extends Long> attempts = JsonNullable.undefined();
+        private JsonNullable<Long> attempts = JsonNullable.undefined();
  
-        private JsonNullable<? extends Long> expireAt = JsonNullable.undefined();  
+        private JsonNullable<Long> expireAt = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -184,7 +182,7 @@ public Builder attempts(long attempts) {
             return this;
         }
 
-        public Builder attempts(JsonNullable<? extends Long> attempts) {
+        public Builder attempts(JsonNullable<Long> attempts) {
             Utils.checkNotNull(attempts, "attempts");
             this.attempts = attempts;
             return this;
@@ -196,7 +194,7 @@ public Builder expireAt(long expireAt) {
             return this;
         }
 
-        public Builder expireAt(JsonNullable<? extends Long> expireAt) {
+        public Builder expireAt(JsonNullable<Long> expireAt) {
             Utils.checkNotNull(expireAt, "expireAt");
             this.expireAt = expireAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/VerificationError.java b/src/main/java/com/clerk/backend_api/models/components/VerificationError.java
index 9a6f13e..ff34d29 100644
--- a/src/main/java/com/clerk/backend_api/models/components/VerificationError.java
+++ b/src/main/java/com/clerk/backend_api/models/components/VerificationError.java
@@ -4,28 +4,25 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
 
-import java.time.OffsetDateTime;
-import java.time.LocalDate;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.clerk.backend_api.utils.OneOfDeserializer;
 import com.clerk.backend_api.utils.TypedObject;
 import com.clerk.backend_api.utils.Utils.JsonShape;
+import com.clerk.backend_api.utils.Utils.TypeReferenceWithShape;
+import com.clerk.backend_api.utils.Utils;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 
 
 @JsonDeserialize(using = VerificationError._Deserializer.class)
 public class VerificationError {
 
-    @com.fasterxml.jackson.annotation.JsonValue
+    @JsonValue
     private TypedObject value;
     
     private VerificationError(TypedObject value) {
@@ -40,7 +37,7 @@ public static VerificationError of(SAMLErrorClerkError value) {
     /**
      * Returns an instance of one of these types:
      * <ul>
-     * <li>{@code SAMLErrorClerkError}</li>
+     * <li>{@code com.clerk.backend_api.models.components.SAMLErrorClerkError}</li>
      * </ul>
      * 
      * <p>Use {@code instanceof} to determine what type is returned. For example:
@@ -67,20 +64,20 @@ public boolean equals(java.lang.Object o) {
             return false;
         }
         VerificationError other = (VerificationError) o;
-        return java.util.Objects.deepEquals(this.value.value(), other.value.value()); 
+        return Objects.deepEquals(this.value.value(), other.value.value()); 
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(value.value());
+        return Objects.hash(value.value());
     }
     
     @SuppressWarnings("serial")
-    public static final class _Deserializer extends com.clerk.backend_api.utils.OneOfDeserializer<VerificationError> {
+    public static final class _Deserializer extends OneOfDeserializer<VerificationError> {
 
         public _Deserializer() {
             super(VerificationError.class,
-                  Utils.TypeReferenceWithShape.of(new TypeReference<SAMLErrorClerkError>() {}, Utils.JsonShape.DEFAULT));
+                  TypeReferenceWithShape.of(new TypeReference<com.clerk.backend_api.models.components.SAMLErrorClerkError>() {}, JsonShape.DEFAULT));
         }
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/VerificationNonce.java b/src/main/java/com/clerk/backend_api/models/components/VerificationNonce.java
index 6fd70cb..5203cd4 100644
--- a/src/main/java/com/clerk/backend_api/models/components/VerificationNonce.java
+++ b/src/main/java/com/clerk/backend_api/models/components/VerificationNonce.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum VerificationNonce {
     NONCE("nonce");
diff --git a/src/main/java/com/clerk/backend_api/models/components/VerificationOTP.java b/src/main/java/com/clerk/backend_api/models/components/VerificationOTP.java
index 8e9f766..901662f 100644
--- a/src/main/java/com/clerk/backend_api/models/components/VerificationOTP.java
+++ b/src/main/java/com/clerk/backend_api/models/components/VerificationOTP.java
@@ -4,16 +4,19 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+import java.util.Optional;
+
 
 public class VerificationOTP {
 
@@ -23,18 +26,20 @@ public class VerificationOTP {
     @JsonProperty("strategy")
     private OTPVerificationStrategy strategy;
 
+    @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("attempts")
-    private long attempts;
+    private Optional<Long> attempts;
 
+    @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("expire_at")
-    private long expireAt;
+    private Optional<Long> expireAt;
 
     @JsonCreator
     public VerificationOTP(
             @JsonProperty("status") OTPVerificationStatus status,
             @JsonProperty("strategy") OTPVerificationStrategy strategy,
-            @JsonProperty("attempts") long attempts,
-            @JsonProperty("expire_at") long expireAt) {
+            @JsonProperty("attempts") Optional<Long> attempts,
+            @JsonProperty("expire_at") Optional<Long> expireAt) {
         Utils.checkNotNull(status, "status");
         Utils.checkNotNull(strategy, "strategy");
         Utils.checkNotNull(attempts, "attempts");
@@ -44,6 +49,12 @@ public VerificationOTP(
         this.attempts = attempts;
         this.expireAt = expireAt;
     }
+    
+    public VerificationOTP(
+            OTPVerificationStatus status,
+            OTPVerificationStrategy strategy) {
+        this(status, strategy, Optional.empty(), Optional.empty());
+    }
 
     @JsonIgnore
     public OTPVerificationStatus status() {
@@ -56,12 +67,12 @@ public OTPVerificationStrategy strategy() {
     }
 
     @JsonIgnore
-    public long attempts() {
+    public Optional<Long> attempts() {
         return attempts;
     }
 
     @JsonIgnore
-    public long expireAt() {
+    public Optional<Long> expireAt() {
         return expireAt;
     }
 
@@ -82,12 +93,24 @@ public VerificationOTP withStrategy(OTPVerificationStrategy strategy) {
     }
 
     public VerificationOTP withAttempts(long attempts) {
+        Utils.checkNotNull(attempts, "attempts");
+        this.attempts = Optional.ofNullable(attempts);
+        return this;
+    }
+
+    public VerificationOTP withAttempts(Optional<Long> attempts) {
         Utils.checkNotNull(attempts, "attempts");
         this.attempts = attempts;
         return this;
     }
 
     public VerificationOTP withExpireAt(long expireAt) {
+        Utils.checkNotNull(expireAt, "expireAt");
+        this.expireAt = Optional.ofNullable(expireAt);
+        return this;
+    }
+
+    public VerificationOTP withExpireAt(Optional<Long> expireAt) {
         Utils.checkNotNull(expireAt, "expireAt");
         this.expireAt = expireAt;
         return this;
@@ -103,15 +126,15 @@ public boolean equals(java.lang.Object o) {
         }
         VerificationOTP other = (VerificationOTP) o;
         return 
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.strategy, other.strategy) &&
-            java.util.Objects.deepEquals(this.attempts, other.attempts) &&
-            java.util.Objects.deepEquals(this.expireAt, other.expireAt);
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.strategy, other.strategy) &&
+            Objects.deepEquals(this.attempts, other.attempts) &&
+            Objects.deepEquals(this.expireAt, other.expireAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             status,
             strategy,
             attempts,
@@ -133,9 +156,9 @@ public final static class Builder {
  
         private OTPVerificationStrategy strategy;
  
-        private Long attempts;
+        private Optional<Long> attempts = Optional.empty();
  
-        private Long expireAt;  
+        private Optional<Long> expireAt = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -154,12 +177,24 @@ public Builder strategy(OTPVerificationStrategy strategy) {
         }
 
         public Builder attempts(long attempts) {
+            Utils.checkNotNull(attempts, "attempts");
+            this.attempts = Optional.ofNullable(attempts);
+            return this;
+        }
+
+        public Builder attempts(Optional<Long> attempts) {
             Utils.checkNotNull(attempts, "attempts");
             this.attempts = attempts;
             return this;
         }
 
         public Builder expireAt(long expireAt) {
+            Utils.checkNotNull(expireAt, "expireAt");
+            this.expireAt = Optional.ofNullable(expireAt);
+            return this;
+        }
+
+        public Builder expireAt(Optional<Long> expireAt) {
             Utils.checkNotNull(expireAt, "expireAt");
             this.expireAt = expireAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/VerificationStatus.java b/src/main/java/com/clerk/backend_api/models/components/VerificationStatus.java
index 414d60e..4bf18c4 100644
--- a/src/main/java/com/clerk/backend_api/models/components/VerificationStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/VerificationStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum VerificationStatus {
     UNVERIFIED("unverified"),
diff --git a/src/main/java/com/clerk/backend_api/models/components/VerificationStrategy.java b/src/main/java/com/clerk/backend_api/models/components/VerificationStrategy.java
index fdc85f0..4aea235 100644
--- a/src/main/java/com/clerk/backend_api/models/components/VerificationStrategy.java
+++ b/src/main/java/com/clerk/backend_api/models/components/VerificationStrategy.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum VerificationStrategy {
     ADMIN("admin");
diff --git a/src/main/java/com/clerk/backend_api/models/components/Verifications.java b/src/main/java/com/clerk/backend_api/models/components/Verifications.java
index e18c280..f0d9f78 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Verifications.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Verifications.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class Verifications {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/Web3Signature.java b/src/main/java/com/clerk/backend_api/models/components/Web3Signature.java
index 8f34b88..be2e612 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Web3Signature.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Web3Signature.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class Web3Signature {
 
     @JsonProperty("status")
@@ -31,19 +31,19 @@ public class Web3Signature {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("attempts")
-    private JsonNullable<? extends Long> attempts;
+    private JsonNullable<Long> attempts;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("expire_at")
-    private JsonNullable<? extends Long> expireAt;
+    private JsonNullable<Long> expireAt;
 
     @JsonCreator
     public Web3Signature(
             @JsonProperty("status") Web3SignatureVerificationStatus status,
             @JsonProperty("strategy") Web3SignatureVerificationStrategy strategy,
             @JsonProperty("nonce") Nonce nonce,
-            @JsonProperty("attempts") JsonNullable<? extends Long> attempts,
-            @JsonProperty("expire_at") JsonNullable<? extends Long> expireAt) {
+            @JsonProperty("attempts") JsonNullable<Long> attempts,
+            @JsonProperty("expire_at") JsonNullable<Long> expireAt) {
         Utils.checkNotNull(status, "status");
         Utils.checkNotNull(strategy, "strategy");
         Utils.checkNotNull(nonce, "nonce");
@@ -78,16 +78,14 @@ public Nonce nonce() {
         return nonce;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> attempts() {
-        return (JsonNullable<Long>) attempts;
+        return attempts;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> expireAt() {
-        return (JsonNullable<Long>) expireAt;
+        return expireAt;
     }
 
     public final static Builder builder() {
@@ -118,7 +116,7 @@ public Web3Signature withAttempts(long attempts) {
         return this;
     }
 
-    public Web3Signature withAttempts(JsonNullable<? extends Long> attempts) {
+    public Web3Signature withAttempts(JsonNullable<Long> attempts) {
         Utils.checkNotNull(attempts, "attempts");
         this.attempts = attempts;
         return this;
@@ -130,7 +128,7 @@ public Web3Signature withExpireAt(long expireAt) {
         return this;
     }
 
-    public Web3Signature withExpireAt(JsonNullable<? extends Long> expireAt) {
+    public Web3Signature withExpireAt(JsonNullable<Long> expireAt) {
         Utils.checkNotNull(expireAt, "expireAt");
         this.expireAt = expireAt;
         return this;
@@ -146,16 +144,16 @@ public boolean equals(java.lang.Object o) {
         }
         Web3Signature other = (Web3Signature) o;
         return 
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.strategy, other.strategy) &&
-            java.util.Objects.deepEquals(this.nonce, other.nonce) &&
-            java.util.Objects.deepEquals(this.attempts, other.attempts) &&
-            java.util.Objects.deepEquals(this.expireAt, other.expireAt);
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.strategy, other.strategy) &&
+            Objects.deepEquals(this.nonce, other.nonce) &&
+            Objects.deepEquals(this.attempts, other.attempts) &&
+            Objects.deepEquals(this.expireAt, other.expireAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             status,
             strategy,
             nonce,
@@ -181,9 +179,9 @@ public final static class Builder {
  
         private Nonce nonce;
  
-        private JsonNullable<? extends Long> attempts = JsonNullable.undefined();
+        private JsonNullable<Long> attempts = JsonNullable.undefined();
  
-        private JsonNullable<? extends Long> expireAt = JsonNullable.undefined();  
+        private JsonNullable<Long> expireAt = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -213,7 +211,7 @@ public Builder attempts(long attempts) {
             return this;
         }
 
-        public Builder attempts(JsonNullable<? extends Long> attempts) {
+        public Builder attempts(JsonNullable<Long> attempts) {
             Utils.checkNotNull(attempts, "attempts");
             this.attempts = attempts;
             return this;
@@ -225,7 +223,7 @@ public Builder expireAt(long expireAt) {
             return this;
         }
 
-        public Builder expireAt(JsonNullable<? extends Long> expireAt) {
+        public Builder expireAt(JsonNullable<Long> expireAt) {
             Utils.checkNotNull(expireAt, "expireAt");
             this.expireAt = expireAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/Web3SignatureVerificationStatus.java b/src/main/java/com/clerk/backend_api/models/components/Web3SignatureVerificationStatus.java
index aab45be..38a337b 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Web3SignatureVerificationStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Web3SignatureVerificationStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum Web3SignatureVerificationStatus {
     VERIFIED("verified");
diff --git a/src/main/java/com/clerk/backend_api/models/components/Web3SignatureVerificationStrategy.java b/src/main/java/com/clerk/backend_api/models/components/Web3SignatureVerificationStrategy.java
index 1d065ea..b303ece 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Web3SignatureVerificationStrategy.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Web3SignatureVerificationStrategy.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum Web3SignatureVerificationStrategy {
     WEB3_METAMASK_SIGNATURE("web3_metamask_signature");
diff --git a/src/main/java/com/clerk/backend_api/models/components/Web3Wallet.java b/src/main/java/com/clerk/backend_api/models/components/Web3Wallet.java
index 6802a96..87ef9dd 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Web3Wallet.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Web3Wallet.java
@@ -4,25 +4,26 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class Web3Wallet {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("id")
-    private Optional<? extends String> id;
+    private Optional<String> id;
 
     /**
      * String representing the object's type. Objects of the same type share the same value.
@@ -54,7 +55,7 @@ public class Web3Wallet {
 
     @JsonCreator
     public Web3Wallet(
-            @JsonProperty("id") Optional<? extends String> id,
+            @JsonProperty("id") Optional<String> id,
             @JsonProperty("object") Web3WalletObject object,
             @JsonProperty("web3_wallet") String web3Wallet,
             @JsonProperty("verification") Optional<? extends Web3WalletVerification> verification,
@@ -82,10 +83,9 @@ public Web3Wallet(
         this(Optional.empty(), object, web3Wallet, Optional.empty(), createdAt, updatedAt);
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> id() {
-        return (Optional<String>) id;
+        return id;
     }
 
     /**
@@ -136,7 +136,7 @@ public Web3Wallet withId(String id) {
         return this;
     }
 
-    public Web3Wallet withId(Optional<? extends String> id) {
+    public Web3Wallet withId(Optional<String> id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
@@ -200,17 +200,17 @@ public boolean equals(java.lang.Object o) {
         }
         Web3Wallet other = (Web3Wallet) o;
         return 
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.web3Wallet, other.web3Wallet) &&
-            java.util.Objects.deepEquals(this.verification, other.verification) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt) &&
-            java.util.Objects.deepEquals(this.updatedAt, other.updatedAt);
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.web3Wallet, other.web3Wallet) &&
+            Objects.deepEquals(this.verification, other.verification) &&
+            Objects.deepEquals(this.createdAt, other.createdAt) &&
+            Objects.deepEquals(this.updatedAt, other.updatedAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             id,
             object,
             web3Wallet,
@@ -232,7 +232,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> id = Optional.empty();
+        private Optional<String> id = Optional.empty();
  
         private Web3WalletObject object;
  
@@ -254,7 +254,7 @@ public Builder id(String id) {
             return this;
         }
 
-        public Builder id(Optional<? extends String> id) {
+        public Builder id(Optional<String> id) {
             Utils.checkNotNull(id, "id");
             this.id = id;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/components/Web3WalletObject.java b/src/main/java/com/clerk/backend_api/models/components/Web3WalletObject.java
index 33c6c3c..7a4ba7e 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Web3WalletObject.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Web3WalletObject.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * Web3WalletObject - String representing the object's type. Objects of the same type share the same value.
diff --git a/src/main/java/com/clerk/backend_api/models/components/Web3WalletVerification.java b/src/main/java/com/clerk/backend_api/models/components/Web3WalletVerification.java
index 60efbe1..f08a89d 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Web3WalletVerification.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Web3WalletVerification.java
@@ -4,28 +4,25 @@
 
 package com.clerk.backend_api.models.components;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
 
-import java.time.OffsetDateTime;
-import java.time.LocalDate;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.clerk.backend_api.utils.OneOfDeserializer;
 import com.clerk.backend_api.utils.TypedObject;
 import com.clerk.backend_api.utils.Utils.JsonShape;
+import com.clerk.backend_api.utils.Utils.TypeReferenceWithShape;
+import com.clerk.backend_api.utils.Utils;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 
 
 @JsonDeserialize(using = Web3WalletVerification._Deserializer.class)
 public class Web3WalletVerification {
 
-    @com.fasterxml.jackson.annotation.JsonValue
+    @JsonValue
     private TypedObject value;
     
     private Web3WalletVerification(TypedObject value) {
@@ -45,8 +42,8 @@ public static Web3WalletVerification of(Web3WalletVerificationAdmin value) {
     /**
      * Returns an instance of one of these types:
      * <ul>
-     * <li>{@code Web3Signature}</li>
-     * <li>{@code Web3WalletVerificationAdmin}</li>
+     * <li>{@code com.clerk.backend_api.models.components.Web3Signature}</li>
+     * <li>{@code com.clerk.backend_api.models.components.Web3WalletVerificationAdmin}</li>
      * </ul>
      * 
      * <p>Use {@code instanceof} to determine what type is returned. For example:
@@ -73,21 +70,21 @@ public boolean equals(java.lang.Object o) {
             return false;
         }
         Web3WalletVerification other = (Web3WalletVerification) o;
-        return java.util.Objects.deepEquals(this.value.value(), other.value.value()); 
+        return Objects.deepEquals(this.value.value(), other.value.value()); 
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(value.value());
+        return Objects.hash(value.value());
     }
     
     @SuppressWarnings("serial")
-    public static final class _Deserializer extends com.clerk.backend_api.utils.OneOfDeserializer<Web3WalletVerification> {
+    public static final class _Deserializer extends OneOfDeserializer<Web3WalletVerification> {
 
         public _Deserializer() {
             super(Web3WalletVerification.class,
-                  Utils.TypeReferenceWithShape.of(new TypeReference<Web3Signature>() {}, Utils.JsonShape.DEFAULT),
-                  Utils.TypeReferenceWithShape.of(new TypeReference<Web3WalletVerificationAdmin>() {}, Utils.JsonShape.DEFAULT));
+                  TypeReferenceWithShape.of(new TypeReference<com.clerk.backend_api.models.components.Web3Signature>() {}, JsonShape.DEFAULT),
+                  TypeReferenceWithShape.of(new TypeReference<com.clerk.backend_api.models.components.Web3WalletVerificationAdmin>() {}, JsonShape.DEFAULT));
         }
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/components/Web3WalletVerificationAdmin.java b/src/main/java/com/clerk/backend_api/models/components/Web3WalletVerificationAdmin.java
index 061fa20..181c0c9 100644
--- a/src/main/java/com/clerk/backend_api/models/components/Web3WalletVerificationAdmin.java
+++ b/src/main/java/com/clerk/backend_api/models/components/Web3WalletVerificationAdmin.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.components;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class Web3WalletVerificationAdmin {
 
     @JsonProperty("status")
@@ -28,18 +28,18 @@ public class Web3WalletVerificationAdmin {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("attempts")
-    private JsonNullable<? extends Long> attempts;
+    private JsonNullable<Long> attempts;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("expire_at")
-    private JsonNullable<? extends Long> expireAt;
+    private JsonNullable<Long> expireAt;
 
     @JsonCreator
     public Web3WalletVerificationAdmin(
             @JsonProperty("status") AdminVerificationWeb3WalletStatus status,
             @JsonProperty("strategy") AdminVerificationWeb3WalletStrategy strategy,
-            @JsonProperty("attempts") JsonNullable<? extends Long> attempts,
-            @JsonProperty("expire_at") JsonNullable<? extends Long> expireAt) {
+            @JsonProperty("attempts") JsonNullable<Long> attempts,
+            @JsonProperty("expire_at") JsonNullable<Long> expireAt) {
         Utils.checkNotNull(status, "status");
         Utils.checkNotNull(strategy, "strategy");
         Utils.checkNotNull(attempts, "attempts");
@@ -66,16 +66,14 @@ public AdminVerificationWeb3WalletStrategy strategy() {
         return strategy;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> attempts() {
-        return (JsonNullable<Long>) attempts;
+        return attempts;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> expireAt() {
-        return (JsonNullable<Long>) expireAt;
+        return expireAt;
     }
 
     public final static Builder builder() {
@@ -100,7 +98,7 @@ public Web3WalletVerificationAdmin withAttempts(long attempts) {
         return this;
     }
 
-    public Web3WalletVerificationAdmin withAttempts(JsonNullable<? extends Long> attempts) {
+    public Web3WalletVerificationAdmin withAttempts(JsonNullable<Long> attempts) {
         Utils.checkNotNull(attempts, "attempts");
         this.attempts = attempts;
         return this;
@@ -112,7 +110,7 @@ public Web3WalletVerificationAdmin withExpireAt(long expireAt) {
         return this;
     }
 
-    public Web3WalletVerificationAdmin withExpireAt(JsonNullable<? extends Long> expireAt) {
+    public Web3WalletVerificationAdmin withExpireAt(JsonNullable<Long> expireAt) {
         Utils.checkNotNull(expireAt, "expireAt");
         this.expireAt = expireAt;
         return this;
@@ -128,15 +126,15 @@ public boolean equals(java.lang.Object o) {
         }
         Web3WalletVerificationAdmin other = (Web3WalletVerificationAdmin) o;
         return 
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.strategy, other.strategy) &&
-            java.util.Objects.deepEquals(this.attempts, other.attempts) &&
-            java.util.Objects.deepEquals(this.expireAt, other.expireAt);
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.strategy, other.strategy) &&
+            Objects.deepEquals(this.attempts, other.attempts) &&
+            Objects.deepEquals(this.expireAt, other.expireAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             status,
             strategy,
             attempts,
@@ -158,9 +156,9 @@ public final static class Builder {
  
         private AdminVerificationWeb3WalletStrategy strategy;
  
-        private JsonNullable<? extends Long> attempts = JsonNullable.undefined();
+        private JsonNullable<Long> attempts = JsonNullable.undefined();
  
-        private JsonNullable<? extends Long> expireAt = JsonNullable.undefined();  
+        private JsonNullable<Long> expireAt = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -184,7 +182,7 @@ public Builder attempts(long attempts) {
             return this;
         }
 
-        public Builder attempts(JsonNullable<? extends Long> attempts) {
+        public Builder attempts(JsonNullable<Long> attempts) {
             Utils.checkNotNull(attempts, "attempts");
             this.attempts = attempts;
             return this;
@@ -196,7 +194,7 @@ public Builder expireAt(long expireAt) {
             return this;
         }
 
-        public Builder expireAt(JsonNullable<? extends Long> expireAt) {
+        public Builder expireAt(JsonNullable<Long> expireAt) {
             Utils.checkNotNull(expireAt, "expireAt");
             this.expireAt = expireAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/errors/ClerkErrors.java b/src/main/java/com/clerk/backend_api/models/errors/ClerkErrors.java
index 8258ae9..db1cb16 100644
--- a/src/main/java/com/clerk/backend_api/models/errors/ClerkErrors.java
+++ b/src/main/java/com/clerk/backend_api/models/errors/ClerkErrors.java
@@ -4,19 +4,17 @@
 
 package com.clerk.backend_api.models.errors;
 
+import com.clerk.backend_api.models.components.ClerkError;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.http.HttpResponse;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -25,7 +23,7 @@
 public class ClerkErrors extends RuntimeException {
 
     @JsonProperty("errors")
-    private java.util.List<com.clerk.backend_api.models.components.ClerkError> errors;
+    private List<ClerkError> errors;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("meta")
@@ -33,7 +31,7 @@ public class ClerkErrors extends RuntimeException {
 
     @JsonCreator
     public ClerkErrors(
-            @JsonProperty("errors") java.util.List<com.clerk.backend_api.models.components.ClerkError> errors,
+            @JsonProperty("errors") List<ClerkError> errors,
             @JsonProperty("meta") Optional<? extends Meta> meta) {
         Utils.checkNotNull(errors, "errors");
         Utils.checkNotNull(meta, "meta");
@@ -42,23 +40,24 @@ public ClerkErrors(
     }
     
     public ClerkErrors(
-            java.util.List<com.clerk.backend_api.models.components.ClerkError> errors) {
+            List<ClerkError> errors) {
         this(errors, Optional.empty());
     }
 
-    public java.util.List<com.clerk.backend_api.models.components.ClerkError> errors(){
+    public List<ClerkError> errors(){
         return errors;
     }
 
-    public Optional<? extends Meta> meta(){
-        return meta;
+    @SuppressWarnings("unchecked")
+    public Optional<Meta> meta(){
+        return (Optional<Meta>) meta;
     }
     
     public final static Builder builder() {
         return new Builder();
     }
 
-    public ClerkErrors withErrors(java.util.List<com.clerk.backend_api.models.components.ClerkError> errors) {
+    public ClerkErrors withErrors(List<ClerkError> errors) {
         Utils.checkNotNull(errors, "errors");
         this.errors = errors;
         return this;
@@ -86,8 +85,8 @@ public boolean equals(java.lang.Object o) {
         }
         ClerkErrors other = (ClerkErrors) o;
         return
-            java.util.Objects.deepEquals(this.errors, other.errors) &&
-            java.util.Objects.deepEquals(this.meta, other.meta);
+            Objects.deepEquals(this.errors, other.errors) &&
+            Objects.deepEquals(this.meta, other.meta);
     }
 
     @Override
@@ -106,7 +105,7 @@ public String toString() {
 
     public final static class Builder {
 
-        private java.util.List<com.clerk.backend_api.models.components.ClerkError> errors;
+        private List<ClerkError> errors;
 
         private Optional<? extends Meta> meta = Optional.empty();
 
@@ -114,7 +113,7 @@ private Builder() {
           // force use of static builder() method
         }
 
-        public Builder errors(java.util.List<com.clerk.backend_api.models.components.ClerkError> errors) {
+        public Builder errors(List<ClerkError> errors) {
             Utils.checkNotNull(errors, "errors");
             this.errors = errors;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/errors/Meta.java b/src/main/java/com/clerk/backend_api/models/errors/Meta.java
index bc8d8ac..2c1e19e 100644
--- a/src/main/java/com/clerk/backend_api/models/errors/Meta.java
+++ b/src/main/java/com/clerk/backend_api/models/errors/Meta.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.errors;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class Meta {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/AddDomainRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/AddDomainRequestBody.java
index 2794800..4938f3d 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/AddDomainRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/AddDomainRequestBody.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class AddDomainRequestBody {
 
     /**
@@ -37,13 +37,13 @@ public class AddDomainRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("proxy_url")
-    private Optional<? extends String> proxyUrl;
+    private Optional<String> proxyUrl;
 
     @JsonCreator
     public AddDomainRequestBody(
             @JsonProperty("name") String name,
             @JsonProperty("is_satellite") boolean isSatellite,
-            @JsonProperty("proxy_url") Optional<? extends String> proxyUrl) {
+            @JsonProperty("proxy_url") Optional<String> proxyUrl) {
         Utils.checkNotNull(name, "name");
         Utils.checkNotNull(isSatellite, "isSatellite");
         Utils.checkNotNull(proxyUrl, "proxyUrl");
@@ -77,10 +77,9 @@ public boolean isSatellite() {
     /**
      * The full URL of the proxy which will forward requests to the Clerk Frontend API for this domain. Applicable only to production instances.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> proxyUrl() {
-        return (Optional<String>) proxyUrl;
+        return proxyUrl;
     }
 
     public final static Builder builder() {
@@ -117,7 +116,7 @@ public AddDomainRequestBody withProxyUrl(String proxyUrl) {
     /**
      * The full URL of the proxy which will forward requests to the Clerk Frontend API for this domain. Applicable only to production instances.
      */
-    public AddDomainRequestBody withProxyUrl(Optional<? extends String> proxyUrl) {
+    public AddDomainRequestBody withProxyUrl(Optional<String> proxyUrl) {
         Utils.checkNotNull(proxyUrl, "proxyUrl");
         this.proxyUrl = proxyUrl;
         return this;
@@ -133,14 +132,14 @@ public boolean equals(java.lang.Object o) {
         }
         AddDomainRequestBody other = (AddDomainRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.isSatellite, other.isSatellite) &&
-            java.util.Objects.deepEquals(this.proxyUrl, other.proxyUrl);
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.isSatellite, other.isSatellite) &&
+            Objects.deepEquals(this.proxyUrl, other.proxyUrl);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             name,
             isSatellite,
             proxyUrl);
@@ -160,7 +159,7 @@ public final static class Builder {
  
         private Boolean isSatellite;
  
-        private Optional<? extends String> proxyUrl = Optional.empty();  
+        private Optional<String> proxyUrl = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -196,7 +195,7 @@ public Builder proxyUrl(String proxyUrl) {
         /**
          * The full URL of the proxy which will forward requests to the Clerk Frontend API for this domain. Applicable only to production instances.
          */
-        public Builder proxyUrl(Optional<? extends String> proxyUrl) {
+        public Builder proxyUrl(Optional<String> proxyUrl) {
             Utils.checkNotNull(proxyUrl, "proxyUrl");
             this.proxyUrl = proxyUrl;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/AddDomainRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/AddDomainRequestBuilder.java
index 826d019..cc438c5 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/AddDomainRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/AddDomainRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class AddDomainRequestBuilder {
 
@@ -26,13 +16,13 @@ public AddDomainRequestBuilder(SDKMethodInterfaces.MethodCallAddDomain sdk) {
         this.sdk = sdk;
     }
                 
-    public AddDomainRequestBuilder request(AddDomainRequestBody request) {
+    public AddDomainRequestBuilder request(com.clerk.backend_api.models.operations.AddDomainRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public AddDomainRequestBuilder request(Optional<? extends AddDomainRequestBody> request) {
+    public AddDomainRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.AddDomainRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/AddDomainResponse.java b/src/main/java/com/clerk/backend_api/models/operations/AddDomainResponse.java
index 6b81763..acd6039 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/AddDomainResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/AddDomainResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Domain;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class AddDomainResponse implements com.clerk.backend_api.utils.Response {
+
+public class AddDomainResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class AddDomainResponse implements com.clerk.backend_api.utils.Response {
     /**
      * A domain
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Domain> domain;
+    private Optional<? extends Domain> domain;
 
     @JsonCreator
     public AddDomainResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Domain> domain) {
+            Optional<? extends Domain> domain) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Domain> domain() {
-        return (Optional<com.clerk.backend_api.models.components.Domain>) domain;
+    public Optional<Domain> domain() {
+        return (Optional<Domain>) domain;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public AddDomainResponse withRawResponse(HttpResponse<InputStream> rawResponse)
     /**
      * A domain
      */
-    public AddDomainResponse withDomain(com.clerk.backend_api.models.components.Domain domain) {
+    public AddDomainResponse withDomain(Domain domain) {
         Utils.checkNotNull(domain, "domain");
         this.domain = Optional.ofNullable(domain);
         return this;
@@ -137,7 +141,7 @@ public AddDomainResponse withDomain(com.clerk.backend_api.models.components.Doma
     /**
      * A domain
      */
-    public AddDomainResponse withDomain(Optional<? extends com.clerk.backend_api.models.components.Domain> domain) {
+    public AddDomainResponse withDomain(Optional<? extends Domain> domain) {
         Utils.checkNotNull(domain, "domain");
         this.domain = domain;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         AddDomainResponse other = (AddDomainResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.domain, other.domain);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.domain, other.domain);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Domain> domain = Optional.empty();  
+        private Optional<? extends Domain> domain = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A domain
          */
-        public Builder domain(com.clerk.backend_api.models.components.Domain domain) {
+        public Builder domain(Domain domain) {
             Utils.checkNotNull(domain, "domain");
             this.domain = Optional.ofNullable(domain);
             return this;
@@ -230,7 +234,7 @@ public Builder domain(com.clerk.backend_api.models.components.Domain domain) {
         /**
          * A domain
          */
-        public Builder domain(Optional<? extends com.clerk.backend_api.models.components.Domain> domain) {
+        public Builder domain(Optional<? extends Domain> domain) {
             Utils.checkNotNull(domain, "domain");
             this.domain = domain;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/AttributeMapping.java b/src/main/java/com/clerk/backend_api/models/operations/AttributeMapping.java
index 5f4930c..b72e411 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/AttributeMapping.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/AttributeMapping.java
@@ -4,19 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
+
 /**
  * AttributeMapping - Define the attribute name mapping between Identity Provider and Clerk's user properties
  */
@@ -25,26 +24,26 @@ public class AttributeMapping {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("user_id")
-    private Optional<? extends String> userId;
+    private Optional<String> userId;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("email_address")
-    private Optional<? extends String> emailAddress;
+    private Optional<String> emailAddress;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("first_name")
-    private Optional<? extends String> firstName;
+    private Optional<String> firstName;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("last_name")
-    private Optional<? extends String> lastName;
+    private Optional<String> lastName;
 
     @JsonCreator
     public AttributeMapping(
-            @JsonProperty("user_id") Optional<? extends String> userId,
-            @JsonProperty("email_address") Optional<? extends String> emailAddress,
-            @JsonProperty("first_name") Optional<? extends String> firstName,
-            @JsonProperty("last_name") Optional<? extends String> lastName) {
+            @JsonProperty("user_id") Optional<String> userId,
+            @JsonProperty("email_address") Optional<String> emailAddress,
+            @JsonProperty("first_name") Optional<String> firstName,
+            @JsonProperty("last_name") Optional<String> lastName) {
         Utils.checkNotNull(userId, "userId");
         Utils.checkNotNull(emailAddress, "emailAddress");
         Utils.checkNotNull(firstName, "firstName");
@@ -59,28 +58,24 @@ public AttributeMapping() {
         this(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> userId() {
-        return (Optional<String>) userId;
+        return userId;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> emailAddress() {
-        return (Optional<String>) emailAddress;
+        return emailAddress;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> firstName() {
-        return (Optional<String>) firstName;
+        return firstName;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> lastName() {
-        return (Optional<String>) lastName;
+        return lastName;
     }
 
     public final static Builder builder() {
@@ -93,7 +88,7 @@ public AttributeMapping withUserId(String userId) {
         return this;
     }
 
-    public AttributeMapping withUserId(Optional<? extends String> userId) {
+    public AttributeMapping withUserId(Optional<String> userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
@@ -105,7 +100,7 @@ public AttributeMapping withEmailAddress(String emailAddress) {
         return this;
     }
 
-    public AttributeMapping withEmailAddress(Optional<? extends String> emailAddress) {
+    public AttributeMapping withEmailAddress(Optional<String> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = emailAddress;
         return this;
@@ -117,7 +112,7 @@ public AttributeMapping withFirstName(String firstName) {
         return this;
     }
 
-    public AttributeMapping withFirstName(Optional<? extends String> firstName) {
+    public AttributeMapping withFirstName(Optional<String> firstName) {
         Utils.checkNotNull(firstName, "firstName");
         this.firstName = firstName;
         return this;
@@ -129,7 +124,7 @@ public AttributeMapping withLastName(String lastName) {
         return this;
     }
 
-    public AttributeMapping withLastName(Optional<? extends String> lastName) {
+    public AttributeMapping withLastName(Optional<String> lastName) {
         Utils.checkNotNull(lastName, "lastName");
         this.lastName = lastName;
         return this;
@@ -145,15 +140,15 @@ public boolean equals(java.lang.Object o) {
         }
         AttributeMapping other = (AttributeMapping) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.firstName, other.firstName) &&
-            java.util.Objects.deepEquals(this.lastName, other.lastName);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.firstName, other.firstName) &&
+            Objects.deepEquals(this.lastName, other.lastName);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             emailAddress,
             firstName,
@@ -171,13 +166,13 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> userId = Optional.empty();
+        private Optional<String> userId = Optional.empty();
  
-        private Optional<? extends String> emailAddress = Optional.empty();
+        private Optional<String> emailAddress = Optional.empty();
  
-        private Optional<? extends String> firstName = Optional.empty();
+        private Optional<String> firstName = Optional.empty();
  
-        private Optional<? extends String> lastName = Optional.empty();  
+        private Optional<String> lastName = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -189,7 +184,7 @@ public Builder userId(String userId) {
             return this;
         }
 
-        public Builder userId(Optional<? extends String> userId) {
+        public Builder userId(Optional<String> userId) {
             Utils.checkNotNull(userId, "userId");
             this.userId = userId;
             return this;
@@ -201,7 +196,7 @@ public Builder emailAddress(String emailAddress) {
             return this;
         }
 
-        public Builder emailAddress(Optional<? extends String> emailAddress) {
+        public Builder emailAddress(Optional<String> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = emailAddress;
             return this;
@@ -213,7 +208,7 @@ public Builder firstName(String firstName) {
             return this;
         }
 
-        public Builder firstName(Optional<? extends String> firstName) {
+        public Builder firstName(Optional<String> firstName) {
             Utils.checkNotNull(firstName, "firstName");
             this.firstName = firstName;
             return this;
@@ -225,7 +220,7 @@ public Builder lastName(String lastName) {
             return this;
         }
 
-        public Builder lastName(Optional<? extends String> lastName) {
+        public Builder lastName(Optional<String> lastName) {
             Utils.checkNotNull(lastName, "lastName");
             this.lastName = lastName;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/BanUserRequest.java b/src/main/java/com/clerk/backend_api/models/operations/BanUserRequest.java
index ee72860..4c6fefb 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/BanUserRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/BanUserRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class BanUserRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         BanUserRequest other = (BanUserRequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId);
+            Objects.deepEquals(this.userId, other.userId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/BanUserRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/BanUserRequestBuilder.java
index c35f3b8..c605d9b 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/BanUserRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/BanUserRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class BanUserRequestBuilder {
 
@@ -26,7 +16,7 @@ public BanUserRequestBuilder(SDKMethodInterfaces.MethodCallBanUser sdk) {
         this.sdk = sdk;
     }
 
-    public BanUserRequestBuilder userId(String userId) {
+    public BanUserRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/BanUserResponse.java b/src/main/java/com/clerk/backend_api/models/operations/BanUserResponse.java
index cd3acd4..6d3cfd6 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/BanUserResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/BanUserResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.User;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class BanUserResponse implements com.clerk.backend_api.utils.Response {
+
+public class BanUserResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class BanUserResponse implements com.clerk.backend_api.utils.Response {
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.User> user;
+    private Optional<? extends User> user;
 
     @JsonCreator
     public BanUserResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.User> user) {
+            Optional<? extends User> user) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.User> user() {
-        return (Optional<com.clerk.backend_api.models.components.User>) user;
+    public Optional<User> user() {
+        return (Optional<User>) user;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public BanUserResponse withRawResponse(HttpResponse<InputStream> rawResponse) {
     /**
      * Success
      */
-    public BanUserResponse withUser(com.clerk.backend_api.models.components.User user) {
+    public BanUserResponse withUser(User user) {
         Utils.checkNotNull(user, "user");
         this.user = Optional.ofNullable(user);
         return this;
@@ -137,7 +141,7 @@ public BanUserResponse withUser(com.clerk.backend_api.models.components.User use
     /**
      * Success
      */
-    public BanUserResponse withUser(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+    public BanUserResponse withUser(Optional<? extends User> user) {
         Utils.checkNotNull(user, "user");
         this.user = user;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         BanUserResponse other = (BanUserResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.user, other.user);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.user, other.user);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.User> user = Optional.empty();  
+        private Optional<? extends User> user = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder user(com.clerk.backend_api.models.components.User user) {
+        public Builder user(User user) {
             Utils.checkNotNull(user, "user");
             this.user = Optional.ofNullable(user);
             return this;
@@ -230,7 +234,7 @@ public Builder user(com.clerk.backend_api.models.components.User user) {
         /**
          * Success
          */
-        public Builder user(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+        public Builder user(Optional<? extends User> user) {
             Utils.checkNotNull(user, "user");
             this.user = user;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ChangeProductionInstanceDomainRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/ChangeProductionInstanceDomainRequestBody.java
index f8af4d7..6c74e5b 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ChangeProductionInstanceDomainRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ChangeProductionInstanceDomainRequestBody.java
@@ -4,20 +4,19 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class ChangeProductionInstanceDomainRequestBody {
 
     /**
@@ -25,11 +24,11 @@ public class ChangeProductionInstanceDomainRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("home_url")
-    private Optional<? extends String> homeUrl;
+    private Optional<String> homeUrl;
 
     @JsonCreator
     public ChangeProductionInstanceDomainRequestBody(
-            @JsonProperty("home_url") Optional<? extends String> homeUrl) {
+            @JsonProperty("home_url") Optional<String> homeUrl) {
         Utils.checkNotNull(homeUrl, "homeUrl");
         this.homeUrl = homeUrl;
     }
@@ -41,10 +40,9 @@ public ChangeProductionInstanceDomainRequestBody() {
     /**
      * The new home URL of the production instance e.g. https://www.example.com
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> homeUrl() {
-        return (Optional<String>) homeUrl;
+        return homeUrl;
     }
 
     public final static Builder builder() {
@@ -63,7 +61,7 @@ public ChangeProductionInstanceDomainRequestBody withHomeUrl(String homeUrl) {
     /**
      * The new home URL of the production instance e.g. https://www.example.com
      */
-    public ChangeProductionInstanceDomainRequestBody withHomeUrl(Optional<? extends String> homeUrl) {
+    public ChangeProductionInstanceDomainRequestBody withHomeUrl(Optional<String> homeUrl) {
         Utils.checkNotNull(homeUrl, "homeUrl");
         this.homeUrl = homeUrl;
         return this;
@@ -79,12 +77,12 @@ public boolean equals(java.lang.Object o) {
         }
         ChangeProductionInstanceDomainRequestBody other = (ChangeProductionInstanceDomainRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.homeUrl, other.homeUrl);
+            Objects.deepEquals(this.homeUrl, other.homeUrl);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             homeUrl);
     }
     
@@ -96,7 +94,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> homeUrl = Optional.empty();  
+        private Optional<String> homeUrl = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -114,7 +112,7 @@ public Builder homeUrl(String homeUrl) {
         /**
          * The new home URL of the production instance e.g. https://www.example.com
          */
-        public Builder homeUrl(Optional<? extends String> homeUrl) {
+        public Builder homeUrl(Optional<String> homeUrl) {
             Utils.checkNotNull(homeUrl, "homeUrl");
             this.homeUrl = homeUrl;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ChangeProductionInstanceDomainRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/ChangeProductionInstanceDomainRequestBuilder.java
index d8f986f..8923174 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ChangeProductionInstanceDomainRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ChangeProductionInstanceDomainRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class ChangeProductionInstanceDomainRequestBuilder {
 
@@ -26,13 +16,13 @@ public ChangeProductionInstanceDomainRequestBuilder(SDKMethodInterfaces.MethodCa
         this.sdk = sdk;
     }
                 
-    public ChangeProductionInstanceDomainRequestBuilder request(ChangeProductionInstanceDomainRequestBody request) {
+    public ChangeProductionInstanceDomainRequestBuilder request(com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public ChangeProductionInstanceDomainRequestBuilder request(Optional<? extends ChangeProductionInstanceDomainRequestBody> request) {
+    public ChangeProductionInstanceDomainRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ChangeProductionInstanceDomainResponse.java b/src/main/java/com/clerk/backend_api/models/operations/ChangeProductionInstanceDomainResponse.java
index 820d744..43317b2 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ChangeProductionInstanceDomainResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ChangeProductionInstanceDomainResponse.java
@@ -4,18 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
 import java.net.http.HttpResponse;
+import java.util.Objects;
+
 
-public class ChangeProductionInstanceDomainResponse implements com.clerk.backend_api.utils.Response {
+public class ChangeProductionInstanceDomainResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -110,14 +112,14 @@ public boolean equals(java.lang.Object o) {
         }
         ChangeProductionInstanceDomainResponse other = (ChangeProductionInstanceDomainResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse);
diff --git a/src/main/java/com/clerk/backend_api/models/operations/Claims.java b/src/main/java/com/clerk/backend_api/models/operations/Claims.java
index 1145222..4dbc120 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/Claims.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/Claims.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * Claims - JWT template claims in JSON format
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CodeType.java b/src/main/java/com/clerk/backend_api/models/operations/CodeType.java
index 815761d..79ff4e4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CodeType.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CodeType.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum CodeType {
     TOTP("totp"),
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateActorTokenRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateActorTokenRequestBody.java
index 546b170..5928553 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateActorTokenRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateActorTokenRequestBody.java
@@ -4,21 +4,24 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class CreateActorTokenRequestBody {
 
     /**
@@ -32,7 +35,7 @@ public class CreateActorTokenRequestBody {
      * This whole payload will be also included in the JWT session token.
      */
     @JsonProperty("actor")
-    private java.util.Map<String, java.lang.Object> actor;
+    private Map<String, Object> actor;
 
     /**
      * Optional parameter to specify the life duration of the actor token in seconds.
@@ -40,7 +43,7 @@ public class CreateActorTokenRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("expires_in_seconds")
-    private Optional<? extends Long> expiresInSeconds;
+    private Optional<Long> expiresInSeconds;
 
     /**
      * The maximum duration that the session which will be created by the generated actor token should last.
@@ -48,14 +51,14 @@ public class CreateActorTokenRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("session_max_duration_in_seconds")
-    private Optional<? extends Long> sessionMaxDurationInSeconds;
+    private Optional<Long> sessionMaxDurationInSeconds;
 
     @JsonCreator
     public CreateActorTokenRequestBody(
             @JsonProperty("user_id") String userId,
-            @JsonProperty("actor") java.util.Map<String, java.lang.Object> actor,
-            @JsonProperty("expires_in_seconds") Optional<? extends Long> expiresInSeconds,
-            @JsonProperty("session_max_duration_in_seconds") Optional<? extends Long> sessionMaxDurationInSeconds) {
+            @JsonProperty("actor") Map<String, Object> actor,
+            @JsonProperty("expires_in_seconds") Optional<Long> expiresInSeconds,
+            @JsonProperty("session_max_duration_in_seconds") Optional<Long> sessionMaxDurationInSeconds) {
         Utils.checkNotNull(userId, "userId");
         actor = Utils.emptyMapIfNull(actor);
         Utils.checkNotNull(expiresInSeconds, "expiresInSeconds");
@@ -68,7 +71,7 @@ public CreateActorTokenRequestBody(
     
     public CreateActorTokenRequestBody(
             String userId,
-            java.util.Map<String, java.lang.Object> actor) {
+            Map<String, Object> actor) {
         this(userId, actor, Optional.empty(), Optional.empty());
     }
 
@@ -85,7 +88,7 @@ public String userId() {
      * This whole payload will be also included in the JWT session token.
      */
     @JsonIgnore
-    public java.util.Map<String, java.lang.Object> actor() {
+    public Map<String, Object> actor() {
         return actor;
     }
 
@@ -93,20 +96,18 @@ public java.util.Map<String, java.lang.Object> actor() {
      * Optional parameter to specify the life duration of the actor token in seconds.
      * By default, the duration is 1 hour.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> expiresInSeconds() {
-        return (Optional<Long>) expiresInSeconds;
+        return expiresInSeconds;
     }
 
     /**
      * The maximum duration that the session which will be created by the generated actor token should last.
      * By default, the duration of a session created via an actor token, lasts 30 minutes.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> sessionMaxDurationInSeconds() {
-        return (Optional<Long>) sessionMaxDurationInSeconds;
+        return sessionMaxDurationInSeconds;
     }
 
     public final static Builder builder() {
@@ -126,7 +127,7 @@ public CreateActorTokenRequestBody withUserId(String userId) {
      * The actor payload. It needs to include a sub property which should contain the ID of the actor.
      * This whole payload will be also included in the JWT session token.
      */
-    public CreateActorTokenRequestBody withActor(java.util.Map<String, java.lang.Object> actor) {
+    public CreateActorTokenRequestBody withActor(Map<String, Object> actor) {
         Utils.checkNotNull(actor, "actor");
         this.actor = actor;
         return this;
@@ -146,7 +147,7 @@ public CreateActorTokenRequestBody withExpiresInSeconds(long expiresInSeconds) {
      * Optional parameter to specify the life duration of the actor token in seconds.
      * By default, the duration is 1 hour.
      */
-    public CreateActorTokenRequestBody withExpiresInSeconds(Optional<? extends Long> expiresInSeconds) {
+    public CreateActorTokenRequestBody withExpiresInSeconds(Optional<Long> expiresInSeconds) {
         Utils.checkNotNull(expiresInSeconds, "expiresInSeconds");
         this.expiresInSeconds = expiresInSeconds;
         return this;
@@ -166,7 +167,7 @@ public CreateActorTokenRequestBody withSessionMaxDurationInSeconds(long sessionM
      * The maximum duration that the session which will be created by the generated actor token should last.
      * By default, the duration of a session created via an actor token, lasts 30 minutes.
      */
-    public CreateActorTokenRequestBody withSessionMaxDurationInSeconds(Optional<? extends Long> sessionMaxDurationInSeconds) {
+    public CreateActorTokenRequestBody withSessionMaxDurationInSeconds(Optional<Long> sessionMaxDurationInSeconds) {
         Utils.checkNotNull(sessionMaxDurationInSeconds, "sessionMaxDurationInSeconds");
         this.sessionMaxDurationInSeconds = sessionMaxDurationInSeconds;
         return this;
@@ -182,15 +183,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateActorTokenRequestBody other = (CreateActorTokenRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.actor, other.actor) &&
-            java.util.Objects.deepEquals(this.expiresInSeconds, other.expiresInSeconds) &&
-            java.util.Objects.deepEquals(this.sessionMaxDurationInSeconds, other.sessionMaxDurationInSeconds);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.actor, other.actor) &&
+            Objects.deepEquals(this.expiresInSeconds, other.expiresInSeconds) &&
+            Objects.deepEquals(this.sessionMaxDurationInSeconds, other.sessionMaxDurationInSeconds);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             actor,
             expiresInSeconds,
@@ -210,11 +211,11 @@ public final static class Builder {
  
         private String userId;
  
-        private java.util.Map<String, java.lang.Object> actor;
+        private Map<String, Object> actor;
  
-        private Optional<? extends Long> expiresInSeconds;
+        private Optional<Long> expiresInSeconds;
  
-        private Optional<? extends Long> sessionMaxDurationInSeconds;  
+        private Optional<Long> sessionMaxDurationInSeconds;  
         
         private Builder() {
           // force use of static builder() method
@@ -233,7 +234,7 @@ public Builder userId(String userId) {
          * The actor payload. It needs to include a sub property which should contain the ID of the actor.
          * This whole payload will be also included in the JWT session token.
          */
-        public Builder actor(java.util.Map<String, java.lang.Object> actor) {
+        public Builder actor(Map<String, Object> actor) {
             Utils.checkNotNull(actor, "actor");
             this.actor = actor;
             return this;
@@ -253,7 +254,7 @@ public Builder expiresInSeconds(long expiresInSeconds) {
          * Optional parameter to specify the life duration of the actor token in seconds.
          * By default, the duration is 1 hour.
          */
-        public Builder expiresInSeconds(Optional<? extends Long> expiresInSeconds) {
+        public Builder expiresInSeconds(Optional<Long> expiresInSeconds) {
             Utils.checkNotNull(expiresInSeconds, "expiresInSeconds");
             this.expiresInSeconds = expiresInSeconds;
             return this;
@@ -273,7 +274,7 @@ public Builder sessionMaxDurationInSeconds(long sessionMaxDurationInSeconds) {
          * The maximum duration that the session which will be created by the generated actor token should last.
          * By default, the duration of a session created via an actor token, lasts 30 minutes.
          */
-        public Builder sessionMaxDurationInSeconds(Optional<? extends Long> sessionMaxDurationInSeconds) {
+        public Builder sessionMaxDurationInSeconds(Optional<Long> sessionMaxDurationInSeconds) {
             Utils.checkNotNull(sessionMaxDurationInSeconds, "sessionMaxDurationInSeconds");
             this.sessionMaxDurationInSeconds = sessionMaxDurationInSeconds;
             return this;
@@ -293,17 +294,17 @@ public CreateActorTokenRequestBody build() {
                 sessionMaxDurationInSeconds);
         }
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_ExpiresInSeconds =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_ExpiresInSeconds =
                 new LazySingletonValue<>(
                         "expires_in_seconds",
                         "3600",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_SessionMaxDurationInSeconds =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_SessionMaxDurationInSeconds =
                 new LazySingletonValue<>(
                         "session_max_duration_in_seconds",
                         "1800",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateActorTokenRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateActorTokenRequestBuilder.java
index f7c6b8d..25077e1 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateActorTokenRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateActorTokenRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreateActorTokenRequestBuilder {
 
@@ -26,13 +16,13 @@ public CreateActorTokenRequestBuilder(SDKMethodInterfaces.MethodCallCreateActorT
         this.sdk = sdk;
     }
                 
-    public CreateActorTokenRequestBuilder request(CreateActorTokenRequestBody request) {
+    public CreateActorTokenRequestBuilder request(com.clerk.backend_api.models.operations.CreateActorTokenRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public CreateActorTokenRequestBuilder request(Optional<? extends CreateActorTokenRequestBody> request) {
+    public CreateActorTokenRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.CreateActorTokenRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateActorTokenResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateActorTokenResponse.java
index 1af41be..7db821a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateActorTokenResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateActorTokenResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.ActorToken;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateActorTokenResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateActorTokenResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateActorTokenResponse implements com.clerk.backend_api.utils.Res
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.ActorToken> actorToken;
+    private Optional<? extends ActorToken> actorToken;
 
     @JsonCreator
     public CreateActorTokenResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.ActorToken> actorToken) {
+            Optional<? extends ActorToken> actorToken) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.ActorToken> actorToken() {
-        return (Optional<com.clerk.backend_api.models.components.ActorToken>) actorToken;
+    public Optional<ActorToken> actorToken() {
+        return (Optional<ActorToken>) actorToken;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateActorTokenResponse withRawResponse(HttpResponse<InputStream> rawRes
     /**
      * Success
      */
-    public CreateActorTokenResponse withActorToken(com.clerk.backend_api.models.components.ActorToken actorToken) {
+    public CreateActorTokenResponse withActorToken(ActorToken actorToken) {
         Utils.checkNotNull(actorToken, "actorToken");
         this.actorToken = Optional.ofNullable(actorToken);
         return this;
@@ -137,7 +141,7 @@ public CreateActorTokenResponse withActorToken(com.clerk.backend_api.models.comp
     /**
      * Success
      */
-    public CreateActorTokenResponse withActorToken(Optional<? extends com.clerk.backend_api.models.components.ActorToken> actorToken) {
+    public CreateActorTokenResponse withActorToken(Optional<? extends ActorToken> actorToken) {
         Utils.checkNotNull(actorToken, "actorToken");
         this.actorToken = actorToken;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateActorTokenResponse other = (CreateActorTokenResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.actorToken, other.actorToken);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.actorToken, other.actorToken);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.ActorToken> actorToken = Optional.empty();  
+        private Optional<? extends ActorToken> actorToken = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder actorToken(com.clerk.backend_api.models.components.ActorToken actorToken) {
+        public Builder actorToken(ActorToken actorToken) {
             Utils.checkNotNull(actorToken, "actorToken");
             this.actorToken = Optional.ofNullable(actorToken);
             return this;
@@ -230,7 +234,7 @@ public Builder actorToken(com.clerk.backend_api.models.components.ActorToken act
         /**
          * Success
          */
-        public Builder actorToken(Optional<? extends com.clerk.backend_api.models.components.ActorToken> actorToken) {
+        public Builder actorToken(Optional<? extends ActorToken> actorToken) {
             Utils.checkNotNull(actorToken, "actorToken");
             this.actorToken = actorToken;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateAllowlistIdentifierRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateAllowlistIdentifierRequestBody.java
index e4c1700..617d76e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateAllowlistIdentifierRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateAllowlistIdentifierRequestBody.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class CreateAllowlistIdentifierRequestBody {
 
     /**
@@ -34,12 +35,12 @@ public class CreateAllowlistIdentifierRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("notify")
-    private Optional<? extends Boolean> notify_;
+    private Optional<Boolean> notify_;
 
     @JsonCreator
     public CreateAllowlistIdentifierRequestBody(
             @JsonProperty("identifier") String identifier,
-            @JsonProperty("notify") Optional<? extends Boolean> notify_) {
+            @JsonProperty("notify") Optional<Boolean> notify_) {
         Utils.checkNotNull(identifier, "identifier");
         Utils.checkNotNull(notify_, "notify_");
         this.identifier = identifier;
@@ -64,10 +65,9 @@ public String identifier() {
      * This flag denotes whether the given identifier will receive an invitation to join the application.
      * Note that this only works for email address and phone number identifiers.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> notify_() {
-        return (Optional<Boolean>) notify_;
+        return notify_;
     }
 
     public final static Builder builder() {
@@ -98,7 +98,7 @@ public CreateAllowlistIdentifierRequestBody withNotify(boolean notify_) {
      * This flag denotes whether the given identifier will receive an invitation to join the application.
      * Note that this only works for email address and phone number identifiers.
      */
-    public CreateAllowlistIdentifierRequestBody withNotify(Optional<? extends Boolean> notify_) {
+    public CreateAllowlistIdentifierRequestBody withNotify(Optional<Boolean> notify_) {
         Utils.checkNotNull(notify_, "notify_");
         this.notify_ = notify_;
         return this;
@@ -114,13 +114,13 @@ public boolean equals(java.lang.Object o) {
         }
         CreateAllowlistIdentifierRequestBody other = (CreateAllowlistIdentifierRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.identifier, other.identifier) &&
-            java.util.Objects.deepEquals(this.notify_, other.notify_);
+            Objects.deepEquals(this.identifier, other.identifier) &&
+            Objects.deepEquals(this.notify_, other.notify_);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             identifier,
             notify_);
     }
@@ -136,7 +136,7 @@ public final static class Builder {
  
         private String identifier;
  
-        private Optional<? extends Boolean> notify_;  
+        private Optional<Boolean> notify_;  
         
         private Builder() {
           // force use of static builder() method
@@ -166,7 +166,7 @@ public Builder notify_(boolean notify_) {
          * This flag denotes whether the given identifier will receive an invitation to join the application.
          * Note that this only works for email address and phone number identifiers.
          */
-        public Builder notify_(Optional<? extends Boolean> notify_) {
+        public Builder notify_(Optional<Boolean> notify_) {
             Utils.checkNotNull(notify_, "notify_");
             this.notify_ = notify_;
             return this;
@@ -181,11 +181,11 @@ public CreateAllowlistIdentifierRequestBody build() {
                 notify_);
         }
 
-        private static final LazySingletonValue<Optional<? extends Boolean>> _SINGLETON_VALUE_Notify =
+        private static final LazySingletonValue<Optional<Boolean>> _SINGLETON_VALUE_Notify =
                 new LazySingletonValue<>(
                         "notify",
                         "false",
-                        new TypeReference<Optional<? extends Boolean>>() {});
+                        new TypeReference<Optional<Boolean>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateAllowlistIdentifierRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateAllowlistIdentifierRequestBuilder.java
index 6633abd..4c6b870 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateAllowlistIdentifierRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateAllowlistIdentifierRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreateAllowlistIdentifierRequestBuilder {
 
@@ -26,13 +16,13 @@ public CreateAllowlistIdentifierRequestBuilder(SDKMethodInterfaces.MethodCallCre
         this.sdk = sdk;
     }
                 
-    public CreateAllowlistIdentifierRequestBuilder request(CreateAllowlistIdentifierRequestBody request) {
+    public CreateAllowlistIdentifierRequestBuilder request(com.clerk.backend_api.models.operations.CreateAllowlistIdentifierRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public CreateAllowlistIdentifierRequestBuilder request(Optional<? extends CreateAllowlistIdentifierRequestBody> request) {
+    public CreateAllowlistIdentifierRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.CreateAllowlistIdentifierRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateAllowlistIdentifierResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateAllowlistIdentifierResponse.java
index a5c7e4f..9f7d468 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateAllowlistIdentifierResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateAllowlistIdentifierResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.AllowlistIdentifier;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateAllowlistIdentifierResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateAllowlistIdentifierResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateAllowlistIdentifierResponse implements com.clerk.backend_api.
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.AllowlistIdentifier> allowlistIdentifier;
+    private Optional<? extends AllowlistIdentifier> allowlistIdentifier;
 
     @JsonCreator
     public CreateAllowlistIdentifierResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.AllowlistIdentifier> allowlistIdentifier) {
+            Optional<? extends AllowlistIdentifier> allowlistIdentifier) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.AllowlistIdentifier> allowlistIdentifier() {
-        return (Optional<com.clerk.backend_api.models.components.AllowlistIdentifier>) allowlistIdentifier;
+    public Optional<AllowlistIdentifier> allowlistIdentifier() {
+        return (Optional<AllowlistIdentifier>) allowlistIdentifier;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateAllowlistIdentifierResponse withRawResponse(HttpResponse<InputStrea
     /**
      * Success
      */
-    public CreateAllowlistIdentifierResponse withAllowlistIdentifier(com.clerk.backend_api.models.components.AllowlistIdentifier allowlistIdentifier) {
+    public CreateAllowlistIdentifierResponse withAllowlistIdentifier(AllowlistIdentifier allowlistIdentifier) {
         Utils.checkNotNull(allowlistIdentifier, "allowlistIdentifier");
         this.allowlistIdentifier = Optional.ofNullable(allowlistIdentifier);
         return this;
@@ -137,7 +141,7 @@ public CreateAllowlistIdentifierResponse withAllowlistIdentifier(com.clerk.backe
     /**
      * Success
      */
-    public CreateAllowlistIdentifierResponse withAllowlistIdentifier(Optional<? extends com.clerk.backend_api.models.components.AllowlistIdentifier> allowlistIdentifier) {
+    public CreateAllowlistIdentifierResponse withAllowlistIdentifier(Optional<? extends AllowlistIdentifier> allowlistIdentifier) {
         Utils.checkNotNull(allowlistIdentifier, "allowlistIdentifier");
         this.allowlistIdentifier = allowlistIdentifier;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateAllowlistIdentifierResponse other = (CreateAllowlistIdentifierResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.allowlistIdentifier, other.allowlistIdentifier);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.allowlistIdentifier, other.allowlistIdentifier);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.AllowlistIdentifier> allowlistIdentifier = Optional.empty();  
+        private Optional<? extends AllowlistIdentifier> allowlistIdentifier = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder allowlistIdentifier(com.clerk.backend_api.models.components.AllowlistIdentifier allowlistIdentifier) {
+        public Builder allowlistIdentifier(AllowlistIdentifier allowlistIdentifier) {
             Utils.checkNotNull(allowlistIdentifier, "allowlistIdentifier");
             this.allowlistIdentifier = Optional.ofNullable(allowlistIdentifier);
             return this;
@@ -230,7 +234,7 @@ public Builder allowlistIdentifier(com.clerk.backend_api.models.components.Allow
         /**
          * Success
          */
-        public Builder allowlistIdentifier(Optional<? extends com.clerk.backend_api.models.components.AllowlistIdentifier> allowlistIdentifier) {
+        public Builder allowlistIdentifier(Optional<? extends AllowlistIdentifier> allowlistIdentifier) {
             Utils.checkNotNull(allowlistIdentifier, "allowlistIdentifier");
             this.allowlistIdentifier = allowlistIdentifier;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateBlocklistIdentifierRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateBlocklistIdentifierRequestBody.java
index 6227c95..4b51465 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateBlocklistIdentifierRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateBlocklistIdentifierRequestBody.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class CreateBlocklistIdentifierRequestBody {
 
@@ -64,12 +63,12 @@ public boolean equals(java.lang.Object o) {
         }
         CreateBlocklistIdentifierRequestBody other = (CreateBlocklistIdentifierRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.identifier, other.identifier);
+            Objects.deepEquals(this.identifier, other.identifier);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             identifier);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateBlocklistIdentifierRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateBlocklistIdentifierRequestBuilder.java
index 1f0d44a..26ad55c 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateBlocklistIdentifierRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateBlocklistIdentifierRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreateBlocklistIdentifierRequestBuilder {
 
@@ -26,13 +16,13 @@ public CreateBlocklistIdentifierRequestBuilder(SDKMethodInterfaces.MethodCallCre
         this.sdk = sdk;
     }
                 
-    public CreateBlocklistIdentifierRequestBuilder request(CreateBlocklistIdentifierRequestBody request) {
+    public CreateBlocklistIdentifierRequestBuilder request(com.clerk.backend_api.models.operations.CreateBlocklistIdentifierRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public CreateBlocklistIdentifierRequestBuilder request(Optional<? extends CreateBlocklistIdentifierRequestBody> request) {
+    public CreateBlocklistIdentifierRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.CreateBlocklistIdentifierRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateBlocklistIdentifierResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateBlocklistIdentifierResponse.java
index bc76642..4b46d90 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateBlocklistIdentifierResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateBlocklistIdentifierResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.BlocklistIdentifier;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateBlocklistIdentifierResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateBlocklistIdentifierResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateBlocklistIdentifierResponse implements com.clerk.backend_api.
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.BlocklistIdentifier> blocklistIdentifier;
+    private Optional<? extends BlocklistIdentifier> blocklistIdentifier;
 
     @JsonCreator
     public CreateBlocklistIdentifierResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.BlocklistIdentifier> blocklistIdentifier) {
+            Optional<? extends BlocklistIdentifier> blocklistIdentifier) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.BlocklistIdentifier> blocklistIdentifier() {
-        return (Optional<com.clerk.backend_api.models.components.BlocklistIdentifier>) blocklistIdentifier;
+    public Optional<BlocklistIdentifier> blocklistIdentifier() {
+        return (Optional<BlocklistIdentifier>) blocklistIdentifier;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateBlocklistIdentifierResponse withRawResponse(HttpResponse<InputStrea
     /**
      * Success
      */
-    public CreateBlocklistIdentifierResponse withBlocklistIdentifier(com.clerk.backend_api.models.components.BlocklistIdentifier blocklistIdentifier) {
+    public CreateBlocklistIdentifierResponse withBlocklistIdentifier(BlocklistIdentifier blocklistIdentifier) {
         Utils.checkNotNull(blocklistIdentifier, "blocklistIdentifier");
         this.blocklistIdentifier = Optional.ofNullable(blocklistIdentifier);
         return this;
@@ -137,7 +141,7 @@ public CreateBlocklistIdentifierResponse withBlocklistIdentifier(com.clerk.backe
     /**
      * Success
      */
-    public CreateBlocklistIdentifierResponse withBlocklistIdentifier(Optional<? extends com.clerk.backend_api.models.components.BlocklistIdentifier> blocklistIdentifier) {
+    public CreateBlocklistIdentifierResponse withBlocklistIdentifier(Optional<? extends BlocklistIdentifier> blocklistIdentifier) {
         Utils.checkNotNull(blocklistIdentifier, "blocklistIdentifier");
         this.blocklistIdentifier = blocklistIdentifier;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateBlocklistIdentifierResponse other = (CreateBlocklistIdentifierResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.blocklistIdentifier, other.blocklistIdentifier);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.blocklistIdentifier, other.blocklistIdentifier);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.BlocklistIdentifier> blocklistIdentifier = Optional.empty();  
+        private Optional<? extends BlocklistIdentifier> blocklistIdentifier = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder blocklistIdentifier(com.clerk.backend_api.models.components.BlocklistIdentifier blocklistIdentifier) {
+        public Builder blocklistIdentifier(BlocklistIdentifier blocklistIdentifier) {
             Utils.checkNotNull(blocklistIdentifier, "blocklistIdentifier");
             this.blocklistIdentifier = Optional.ofNullable(blocklistIdentifier);
             return this;
@@ -230,7 +234,7 @@ public Builder blocklistIdentifier(com.clerk.backend_api.models.components.Block
         /**
          * Success
          */
-        public Builder blocklistIdentifier(Optional<? extends com.clerk.backend_api.models.components.BlocklistIdentifier> blocklistIdentifier) {
+        public Builder blocklistIdentifier(Optional<? extends BlocklistIdentifier> blocklistIdentifier) {
             Utils.checkNotNull(blocklistIdentifier, "blocklistIdentifier");
             this.blocklistIdentifier = blocklistIdentifier;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateEmailAddressRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateEmailAddressRequestBody.java
index 84facf3..388f170 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateEmailAddressRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateEmailAddressRequestBody.java
@@ -4,21 +4,21 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class CreateEmailAddressRequestBody {
 
     /**
@@ -26,21 +26,21 @@ public class CreateEmailAddressRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("user_id")
-    private Optional<? extends String> userId;
+    private Optional<String> userId;
 
     /**
      * The new email address. Must adhere to the RFC 5322 specification for email address format.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("email_address")
-    private Optional<? extends String> emailAddress;
+    private Optional<String> emailAddress;
 
     /**
      * When created, the email address will be marked as verified.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("verified")
-    private JsonNullable<? extends Boolean> verified;
+    private JsonNullable<Boolean> verified;
 
     /**
      * Create this email address as the primary email address for the user.
@@ -48,14 +48,14 @@ public class CreateEmailAddressRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("primary")
-    private JsonNullable<? extends Boolean> primary;
+    private JsonNullable<Boolean> primary;
 
     @JsonCreator
     public CreateEmailAddressRequestBody(
-            @JsonProperty("user_id") Optional<? extends String> userId,
-            @JsonProperty("email_address") Optional<? extends String> emailAddress,
-            @JsonProperty("verified") JsonNullable<? extends Boolean> verified,
-            @JsonProperty("primary") JsonNullable<? extends Boolean> primary) {
+            @JsonProperty("user_id") Optional<String> userId,
+            @JsonProperty("email_address") Optional<String> emailAddress,
+            @JsonProperty("verified") JsonNullable<Boolean> verified,
+            @JsonProperty("primary") JsonNullable<Boolean> primary) {
         Utils.checkNotNull(userId, "userId");
         Utils.checkNotNull(emailAddress, "emailAddress");
         Utils.checkNotNull(verified, "verified");
@@ -73,38 +73,34 @@ public CreateEmailAddressRequestBody() {
     /**
      * The ID representing the user
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> userId() {
-        return (Optional<String>) userId;
+        return userId;
     }
 
     /**
      * The new email address. Must adhere to the RFC 5322 specification for email address format.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> emailAddress() {
-        return (Optional<String>) emailAddress;
+        return emailAddress;
     }
 
     /**
      * When created, the email address will be marked as verified.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> verified() {
-        return (JsonNullable<Boolean>) verified;
+        return verified;
     }
 
     /**
      * Create this email address as the primary email address for the user.
      * Default: false, unless it is the first email address.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> primary() {
-        return (JsonNullable<Boolean>) primary;
+        return primary;
     }
 
     public final static Builder builder() {
@@ -123,7 +119,7 @@ public CreateEmailAddressRequestBody withUserId(String userId) {
     /**
      * The ID representing the user
      */
-    public CreateEmailAddressRequestBody withUserId(Optional<? extends String> userId) {
+    public CreateEmailAddressRequestBody withUserId(Optional<String> userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
@@ -141,7 +137,7 @@ public CreateEmailAddressRequestBody withEmailAddress(String emailAddress) {
     /**
      * The new email address. Must adhere to the RFC 5322 specification for email address format.
      */
-    public CreateEmailAddressRequestBody withEmailAddress(Optional<? extends String> emailAddress) {
+    public CreateEmailAddressRequestBody withEmailAddress(Optional<String> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = emailAddress;
         return this;
@@ -159,7 +155,7 @@ public CreateEmailAddressRequestBody withVerified(boolean verified) {
     /**
      * When created, the email address will be marked as verified.
      */
-    public CreateEmailAddressRequestBody withVerified(JsonNullable<? extends Boolean> verified) {
+    public CreateEmailAddressRequestBody withVerified(JsonNullable<Boolean> verified) {
         Utils.checkNotNull(verified, "verified");
         this.verified = verified;
         return this;
@@ -179,7 +175,7 @@ public CreateEmailAddressRequestBody withPrimary(boolean primary) {
      * Create this email address as the primary email address for the user.
      * Default: false, unless it is the first email address.
      */
-    public CreateEmailAddressRequestBody withPrimary(JsonNullable<? extends Boolean> primary) {
+    public CreateEmailAddressRequestBody withPrimary(JsonNullable<Boolean> primary) {
         Utils.checkNotNull(primary, "primary");
         this.primary = primary;
         return this;
@@ -195,15 +191,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateEmailAddressRequestBody other = (CreateEmailAddressRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.verified, other.verified) &&
-            java.util.Objects.deepEquals(this.primary, other.primary);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.verified, other.verified) &&
+            Objects.deepEquals(this.primary, other.primary);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             emailAddress,
             verified,
@@ -221,13 +217,13 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> userId = Optional.empty();
+        private Optional<String> userId = Optional.empty();
  
-        private Optional<? extends String> emailAddress = Optional.empty();
+        private Optional<String> emailAddress = Optional.empty();
  
-        private JsonNullable<? extends Boolean> verified = JsonNullable.undefined();
+        private JsonNullable<Boolean> verified = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> primary = JsonNullable.undefined();  
+        private JsonNullable<Boolean> primary = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -245,7 +241,7 @@ public Builder userId(String userId) {
         /**
          * The ID representing the user
          */
-        public Builder userId(Optional<? extends String> userId) {
+        public Builder userId(Optional<String> userId) {
             Utils.checkNotNull(userId, "userId");
             this.userId = userId;
             return this;
@@ -263,7 +259,7 @@ public Builder emailAddress(String emailAddress) {
         /**
          * The new email address. Must adhere to the RFC 5322 specification for email address format.
          */
-        public Builder emailAddress(Optional<? extends String> emailAddress) {
+        public Builder emailAddress(Optional<String> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = emailAddress;
             return this;
@@ -281,7 +277,7 @@ public Builder verified(boolean verified) {
         /**
          * When created, the email address will be marked as verified.
          */
-        public Builder verified(JsonNullable<? extends Boolean> verified) {
+        public Builder verified(JsonNullable<Boolean> verified) {
             Utils.checkNotNull(verified, "verified");
             this.verified = verified;
             return this;
@@ -301,7 +297,7 @@ public Builder primary(boolean primary) {
          * Create this email address as the primary email address for the user.
          * Default: false, unless it is the first email address.
          */
-        public Builder primary(JsonNullable<? extends Boolean> primary) {
+        public Builder primary(JsonNullable<Boolean> primary) {
             Utils.checkNotNull(primary, "primary");
             this.primary = primary;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateEmailAddressRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateEmailAddressRequestBuilder.java
index e70f187..a9b3f12 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateEmailAddressRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateEmailAddressRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreateEmailAddressRequestBuilder {
 
@@ -26,13 +16,13 @@ public CreateEmailAddressRequestBuilder(SDKMethodInterfaces.MethodCallCreateEmai
         this.sdk = sdk;
     }
                 
-    public CreateEmailAddressRequestBuilder request(CreateEmailAddressRequestBody request) {
+    public CreateEmailAddressRequestBuilder request(com.clerk.backend_api.models.operations.CreateEmailAddressRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public CreateEmailAddressRequestBuilder request(Optional<? extends CreateEmailAddressRequestBody> request) {
+    public CreateEmailAddressRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.CreateEmailAddressRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateEmailAddressResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateEmailAddressResponse.java
index eb970f2..0c327e0 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateEmailAddressResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateEmailAddressResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.EmailAddress;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateEmailAddressResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateEmailAddressResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateEmailAddressResponse implements com.clerk.backend_api.utils.R
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress;
+    private Optional<? extends EmailAddress> emailAddress;
 
     @JsonCreator
     public CreateEmailAddressResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress) {
+            Optional<? extends EmailAddress> emailAddress) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.EmailAddress> emailAddress() {
-        return (Optional<com.clerk.backend_api.models.components.EmailAddress>) emailAddress;
+    public Optional<EmailAddress> emailAddress() {
+        return (Optional<EmailAddress>) emailAddress;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateEmailAddressResponse withRawResponse(HttpResponse<InputStream> rawR
     /**
      * Success
      */
-    public CreateEmailAddressResponse withEmailAddress(com.clerk.backend_api.models.components.EmailAddress emailAddress) {
+    public CreateEmailAddressResponse withEmailAddress(EmailAddress emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = Optional.ofNullable(emailAddress);
         return this;
@@ -137,7 +141,7 @@ public CreateEmailAddressResponse withEmailAddress(com.clerk.backend_api.models.
     /**
      * Success
      */
-    public CreateEmailAddressResponse withEmailAddress(Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress) {
+    public CreateEmailAddressResponse withEmailAddress(Optional<? extends EmailAddress> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = emailAddress;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateEmailAddressResponse other = (CreateEmailAddressResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.emailAddress, other.emailAddress);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress = Optional.empty();  
+        private Optional<? extends EmailAddress> emailAddress = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder emailAddress(com.clerk.backend_api.models.components.EmailAddress emailAddress) {
+        public Builder emailAddress(EmailAddress emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = Optional.ofNullable(emailAddress);
             return this;
@@ -230,7 +234,7 @@ public Builder emailAddress(com.clerk.backend_api.models.components.EmailAddress
         /**
          * Success
          */
-        public Builder emailAddress(Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress) {
+        public Builder emailAddress(Optional<? extends EmailAddress> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = emailAddress;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationPublicMetadata.java
index 1e27781..42fffaa 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * CreateInvitationPublicMetadata - Metadata that will be attached to the newly created invitation.
  * The value of this property should be a well-formed JSON object.
@@ -44,7 +42,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationRequestBody.java
index f8646bc..c942fda 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationRequestBody.java
@@ -4,21 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
+
 /**
  * CreateInvitationRequestBody - Required parameters
  */
@@ -46,7 +48,7 @@ public class CreateInvitationRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("redirect_url")
-    private Optional<? extends String> redirectUrl;
+    private Optional<String> redirectUrl;
 
     /**
      * Optional flag which denotes whether an email invitation should be sent to the given email address.
@@ -54,22 +56,22 @@ public class CreateInvitationRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("notify")
-    private JsonNullable<? extends Boolean> notify_;
+    private JsonNullable<Boolean> notify_;
 
     /**
      * Whether an invitation should be created if there is already an existing invitation for this email address, or it's claimed by another user.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("ignore_existing")
-    private JsonNullable<? extends Boolean> ignoreExisting;
+    private JsonNullable<Boolean> ignoreExisting;
 
     @JsonCreator
     public CreateInvitationRequestBody(
             @JsonProperty("email_address") String emailAddress,
             @JsonProperty("public_metadata") Optional<? extends CreateInvitationPublicMetadata> publicMetadata,
-            @JsonProperty("redirect_url") Optional<? extends String> redirectUrl,
-            @JsonProperty("notify") JsonNullable<? extends Boolean> notify_,
-            @JsonProperty("ignore_existing") JsonNullable<? extends Boolean> ignoreExisting) {
+            @JsonProperty("redirect_url") Optional<String> redirectUrl,
+            @JsonProperty("notify") JsonNullable<Boolean> notify_,
+            @JsonProperty("ignore_existing") JsonNullable<Boolean> ignoreExisting) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         Utils.checkNotNull(publicMetadata, "publicMetadata");
         Utils.checkNotNull(redirectUrl, "redirectUrl");
@@ -110,29 +112,26 @@ public Optional<CreateInvitationPublicMetadata> publicMetadata() {
      * Optional URL which specifies where to redirect the user once they click the invitation link.
      * This is only required if you have implemented a [custom flow](https://clerk.com/docs/authentication/invitations#custom-flow) and you're not using Clerk Hosted Pages or Clerk Components.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> redirectUrl() {
-        return (Optional<String>) redirectUrl;
+        return redirectUrl;
     }
 
     /**
      * Optional flag which denotes whether an email invitation should be sent to the given email address.
      * Defaults to true.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> notify_() {
-        return (JsonNullable<Boolean>) notify_;
+        return notify_;
     }
 
     /**
      * Whether an invitation should be created if there is already an existing invitation for this email address, or it's claimed by another user.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> ignoreExisting() {
-        return (JsonNullable<Boolean>) ignoreExisting;
+        return ignoreExisting;
     }
 
     public final static Builder builder() {
@@ -184,7 +183,7 @@ public CreateInvitationRequestBody withRedirectUrl(String redirectUrl) {
      * Optional URL which specifies where to redirect the user once they click the invitation link.
      * This is only required if you have implemented a [custom flow](https://clerk.com/docs/authentication/invitations#custom-flow) and you're not using Clerk Hosted Pages or Clerk Components.
      */
-    public CreateInvitationRequestBody withRedirectUrl(Optional<? extends String> redirectUrl) {
+    public CreateInvitationRequestBody withRedirectUrl(Optional<String> redirectUrl) {
         Utils.checkNotNull(redirectUrl, "redirectUrl");
         this.redirectUrl = redirectUrl;
         return this;
@@ -204,7 +203,7 @@ public CreateInvitationRequestBody withNotify(boolean notify_) {
      * Optional flag which denotes whether an email invitation should be sent to the given email address.
      * Defaults to true.
      */
-    public CreateInvitationRequestBody withNotify(JsonNullable<? extends Boolean> notify_) {
+    public CreateInvitationRequestBody withNotify(JsonNullable<Boolean> notify_) {
         Utils.checkNotNull(notify_, "notify_");
         this.notify_ = notify_;
         return this;
@@ -222,7 +221,7 @@ public CreateInvitationRequestBody withIgnoreExisting(boolean ignoreExisting) {
     /**
      * Whether an invitation should be created if there is already an existing invitation for this email address, or it's claimed by another user.
      */
-    public CreateInvitationRequestBody withIgnoreExisting(JsonNullable<? extends Boolean> ignoreExisting) {
+    public CreateInvitationRequestBody withIgnoreExisting(JsonNullable<Boolean> ignoreExisting) {
         Utils.checkNotNull(ignoreExisting, "ignoreExisting");
         this.ignoreExisting = ignoreExisting;
         return this;
@@ -238,16 +237,16 @@ public boolean equals(java.lang.Object o) {
         }
         CreateInvitationRequestBody other = (CreateInvitationRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.redirectUrl, other.redirectUrl) &&
-            java.util.Objects.deepEquals(this.notify_, other.notify_) &&
-            java.util.Objects.deepEquals(this.ignoreExisting, other.ignoreExisting);
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.redirectUrl, other.redirectUrl) &&
+            Objects.deepEquals(this.notify_, other.notify_) &&
+            Objects.deepEquals(this.ignoreExisting, other.ignoreExisting);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             emailAddress,
             publicMetadata,
             redirectUrl,
@@ -271,11 +270,11 @@ public final static class Builder {
  
         private Optional<? extends CreateInvitationPublicMetadata> publicMetadata = Optional.empty();
  
-        private Optional<? extends String> redirectUrl = Optional.empty();
+        private Optional<String> redirectUrl = Optional.empty();
  
-        private JsonNullable<? extends Boolean> notify_;
+        private JsonNullable<Boolean> notify_;
  
-        private JsonNullable<? extends Boolean> ignoreExisting;  
+        private JsonNullable<Boolean> ignoreExisting;  
         
         private Builder() {
           // force use of static builder() method
@@ -326,7 +325,7 @@ public Builder redirectUrl(String redirectUrl) {
          * Optional URL which specifies where to redirect the user once they click the invitation link.
          * This is only required if you have implemented a [custom flow](https://clerk.com/docs/authentication/invitations#custom-flow) and you're not using Clerk Hosted Pages or Clerk Components.
          */
-        public Builder redirectUrl(Optional<? extends String> redirectUrl) {
+        public Builder redirectUrl(Optional<String> redirectUrl) {
             Utils.checkNotNull(redirectUrl, "redirectUrl");
             this.redirectUrl = redirectUrl;
             return this;
@@ -346,7 +345,7 @@ public Builder notify_(boolean notify_) {
          * Optional flag which denotes whether an email invitation should be sent to the given email address.
          * Defaults to true.
          */
-        public Builder notify_(JsonNullable<? extends Boolean> notify_) {
+        public Builder notify_(JsonNullable<Boolean> notify_) {
             Utils.checkNotNull(notify_, "notify_");
             this.notify_ = notify_;
             return this;
@@ -364,7 +363,7 @@ public Builder ignoreExisting(boolean ignoreExisting) {
         /**
          * Whether an invitation should be created if there is already an existing invitation for this email address, or it's claimed by another user.
          */
-        public Builder ignoreExisting(JsonNullable<? extends Boolean> ignoreExisting) {
+        public Builder ignoreExisting(JsonNullable<Boolean> ignoreExisting) {
             Utils.checkNotNull(ignoreExisting, "ignoreExisting");
             this.ignoreExisting = ignoreExisting;
             return this;
@@ -385,17 +384,17 @@ public CreateInvitationRequestBody build() {
                 ignoreExisting);
         }
 
-        private static final LazySingletonValue<JsonNullable<? extends Boolean>> _SINGLETON_VALUE_Notify =
+        private static final LazySingletonValue<JsonNullable<Boolean>> _SINGLETON_VALUE_Notify =
                 new LazySingletonValue<>(
                         "notify",
                         "true",
-                        new TypeReference<JsonNullable<? extends Boolean>>() {});
+                        new TypeReference<JsonNullable<Boolean>>() {});
 
-        private static final LazySingletonValue<JsonNullable<? extends Boolean>> _SINGLETON_VALUE_IgnoreExisting =
+        private static final LazySingletonValue<JsonNullable<Boolean>> _SINGLETON_VALUE_IgnoreExisting =
                 new LazySingletonValue<>(
                         "ignore_existing",
                         "false",
-                        new TypeReference<JsonNullable<? extends Boolean>>() {});
+                        new TypeReference<JsonNullable<Boolean>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationRequestBuilder.java
index 2e08f0b..ac5692b 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreateInvitationRequestBuilder {
 
@@ -26,13 +16,13 @@ public CreateInvitationRequestBuilder(SDKMethodInterfaces.MethodCallCreateInvita
         this.sdk = sdk;
     }
                 
-    public CreateInvitationRequestBuilder request(CreateInvitationRequestBody request) {
+    public CreateInvitationRequestBuilder request(com.clerk.backend_api.models.operations.CreateInvitationRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public CreateInvitationRequestBuilder request(Optional<? extends CreateInvitationRequestBody> request) {
+    public CreateInvitationRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.CreateInvitationRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationResponse.java
index 37d190b..e7c7f06 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateInvitationResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Invitation;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateInvitationResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateInvitationResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateInvitationResponse implements com.clerk.backend_api.utils.Res
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Invitation> invitation;
+    private Optional<? extends Invitation> invitation;
 
     @JsonCreator
     public CreateInvitationResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Invitation> invitation) {
+            Optional<? extends Invitation> invitation) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Invitation> invitation() {
-        return (Optional<com.clerk.backend_api.models.components.Invitation>) invitation;
+    public Optional<Invitation> invitation() {
+        return (Optional<Invitation>) invitation;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateInvitationResponse withRawResponse(HttpResponse<InputStream> rawRes
     /**
      * Success
      */
-    public CreateInvitationResponse withInvitation(com.clerk.backend_api.models.components.Invitation invitation) {
+    public CreateInvitationResponse withInvitation(Invitation invitation) {
         Utils.checkNotNull(invitation, "invitation");
         this.invitation = Optional.ofNullable(invitation);
         return this;
@@ -137,7 +141,7 @@ public CreateInvitationResponse withInvitation(com.clerk.backend_api.models.comp
     /**
      * Success
      */
-    public CreateInvitationResponse withInvitation(Optional<? extends com.clerk.backend_api.models.components.Invitation> invitation) {
+    public CreateInvitationResponse withInvitation(Optional<? extends Invitation> invitation) {
         Utils.checkNotNull(invitation, "invitation");
         this.invitation = invitation;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateInvitationResponse other = (CreateInvitationResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.invitation, other.invitation);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.invitation, other.invitation);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Invitation> invitation = Optional.empty();  
+        private Optional<? extends Invitation> invitation = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder invitation(com.clerk.backend_api.models.components.Invitation invitation) {
+        public Builder invitation(Invitation invitation) {
             Utils.checkNotNull(invitation, "invitation");
             this.invitation = Optional.ofNullable(invitation);
             return this;
@@ -230,7 +234,7 @@ public Builder invitation(com.clerk.backend_api.models.components.Invitation inv
         /**
          * Success
          */
-        public Builder invitation(Optional<? extends com.clerk.backend_api.models.components.Invitation> invitation) {
+        public Builder invitation(Optional<? extends Invitation> invitation) {
             Utils.checkNotNull(invitation, "invitation");
             this.invitation = invitation;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateJWTTemplateRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateJWTTemplateRequestBody.java
index fdfa138..47f7b8e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateJWTTemplateRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateJWTTemplateRequestBody.java
@@ -4,21 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Double;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class CreateJWTTemplateRequestBody {
 
     /**
@@ -26,7 +28,7 @@ public class CreateJWTTemplateRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("name")
-    private Optional<? extends String> name;
+    private Optional<String> name;
 
     /**
      * JWT template claims in JSON format
@@ -40,45 +42,45 @@ public class CreateJWTTemplateRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("lifetime")
-    private JsonNullable<? extends Double> lifetime;
+    private JsonNullable<Double> lifetime;
 
     /**
      * JWT token allowed clock skew
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("allowed_clock_skew")
-    private JsonNullable<? extends Double> allowedClockSkew;
+    private JsonNullable<Double> allowedClockSkew;
 
     /**
      * Whether a custom signing key/algorithm is also provided for this template
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("custom_signing_key")
-    private Optional<? extends Boolean> customSigningKey;
+    private Optional<Boolean> customSigningKey;
 
     /**
      * The custom signing algorithm to use when minting JWTs
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("signing_algorithm")
-    private JsonNullable<? extends String> signingAlgorithm;
+    private JsonNullable<String> signingAlgorithm;
 
     /**
      * The custom signing private key to use when minting JWTs
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("signing_key")
-    private JsonNullable<? extends String> signingKey;
+    private JsonNullable<String> signingKey;
 
     @JsonCreator
     public CreateJWTTemplateRequestBody(
-            @JsonProperty("name") Optional<? extends String> name,
+            @JsonProperty("name") Optional<String> name,
             @JsonProperty("claims") Optional<? extends Claims> claims,
-            @JsonProperty("lifetime") JsonNullable<? extends Double> lifetime,
-            @JsonProperty("allowed_clock_skew") JsonNullable<? extends Double> allowedClockSkew,
-            @JsonProperty("custom_signing_key") Optional<? extends Boolean> customSigningKey,
-            @JsonProperty("signing_algorithm") JsonNullable<? extends String> signingAlgorithm,
-            @JsonProperty("signing_key") JsonNullable<? extends String> signingKey) {
+            @JsonProperty("lifetime") JsonNullable<Double> lifetime,
+            @JsonProperty("allowed_clock_skew") JsonNullable<Double> allowedClockSkew,
+            @JsonProperty("custom_signing_key") Optional<Boolean> customSigningKey,
+            @JsonProperty("signing_algorithm") JsonNullable<String> signingAlgorithm,
+            @JsonProperty("signing_key") JsonNullable<String> signingKey) {
         Utils.checkNotNull(name, "name");
         Utils.checkNotNull(claims, "claims");
         Utils.checkNotNull(lifetime, "lifetime");
@@ -102,10 +104,9 @@ public CreateJWTTemplateRequestBody() {
     /**
      * JWT template name
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> name() {
-        return (Optional<String>) name;
+        return name;
     }
 
     /**
@@ -120,46 +121,41 @@ public Optional<Claims> claims() {
     /**
      * JWT token lifetime
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Double> lifetime() {
-        return (JsonNullable<Double>) lifetime;
+        return lifetime;
     }
 
     /**
      * JWT token allowed clock skew
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Double> allowedClockSkew() {
-        return (JsonNullable<Double>) allowedClockSkew;
+        return allowedClockSkew;
     }
 
     /**
      * Whether a custom signing key/algorithm is also provided for this template
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> customSigningKey() {
-        return (Optional<Boolean>) customSigningKey;
+        return customSigningKey;
     }
 
     /**
      * The custom signing algorithm to use when minting JWTs
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> signingAlgorithm() {
-        return (JsonNullable<String>) signingAlgorithm;
+        return signingAlgorithm;
     }
 
     /**
      * The custom signing private key to use when minting JWTs
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> signingKey() {
-        return (JsonNullable<String>) signingKey;
+        return signingKey;
     }
 
     public final static Builder builder() {
@@ -178,7 +174,7 @@ public CreateJWTTemplateRequestBody withName(String name) {
     /**
      * JWT template name
      */
-    public CreateJWTTemplateRequestBody withName(Optional<? extends String> name) {
+    public CreateJWTTemplateRequestBody withName(Optional<String> name) {
         Utils.checkNotNull(name, "name");
         this.name = name;
         return this;
@@ -214,7 +210,7 @@ public CreateJWTTemplateRequestBody withLifetime(double lifetime) {
     /**
      * JWT token lifetime
      */
-    public CreateJWTTemplateRequestBody withLifetime(JsonNullable<? extends Double> lifetime) {
+    public CreateJWTTemplateRequestBody withLifetime(JsonNullable<Double> lifetime) {
         Utils.checkNotNull(lifetime, "lifetime");
         this.lifetime = lifetime;
         return this;
@@ -232,7 +228,7 @@ public CreateJWTTemplateRequestBody withAllowedClockSkew(double allowedClockSkew
     /**
      * JWT token allowed clock skew
      */
-    public CreateJWTTemplateRequestBody withAllowedClockSkew(JsonNullable<? extends Double> allowedClockSkew) {
+    public CreateJWTTemplateRequestBody withAllowedClockSkew(JsonNullable<Double> allowedClockSkew) {
         Utils.checkNotNull(allowedClockSkew, "allowedClockSkew");
         this.allowedClockSkew = allowedClockSkew;
         return this;
@@ -250,7 +246,7 @@ public CreateJWTTemplateRequestBody withCustomSigningKey(boolean customSigningKe
     /**
      * Whether a custom signing key/algorithm is also provided for this template
      */
-    public CreateJWTTemplateRequestBody withCustomSigningKey(Optional<? extends Boolean> customSigningKey) {
+    public CreateJWTTemplateRequestBody withCustomSigningKey(Optional<Boolean> customSigningKey) {
         Utils.checkNotNull(customSigningKey, "customSigningKey");
         this.customSigningKey = customSigningKey;
         return this;
@@ -268,7 +264,7 @@ public CreateJWTTemplateRequestBody withSigningAlgorithm(String signingAlgorithm
     /**
      * The custom signing algorithm to use when minting JWTs
      */
-    public CreateJWTTemplateRequestBody withSigningAlgorithm(JsonNullable<? extends String> signingAlgorithm) {
+    public CreateJWTTemplateRequestBody withSigningAlgorithm(JsonNullable<String> signingAlgorithm) {
         Utils.checkNotNull(signingAlgorithm, "signingAlgorithm");
         this.signingAlgorithm = signingAlgorithm;
         return this;
@@ -286,7 +282,7 @@ public CreateJWTTemplateRequestBody withSigningKey(String signingKey) {
     /**
      * The custom signing private key to use when minting JWTs
      */
-    public CreateJWTTemplateRequestBody withSigningKey(JsonNullable<? extends String> signingKey) {
+    public CreateJWTTemplateRequestBody withSigningKey(JsonNullable<String> signingKey) {
         Utils.checkNotNull(signingKey, "signingKey");
         this.signingKey = signingKey;
         return this;
@@ -302,18 +298,18 @@ public boolean equals(java.lang.Object o) {
         }
         CreateJWTTemplateRequestBody other = (CreateJWTTemplateRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.claims, other.claims) &&
-            java.util.Objects.deepEquals(this.lifetime, other.lifetime) &&
-            java.util.Objects.deepEquals(this.allowedClockSkew, other.allowedClockSkew) &&
-            java.util.Objects.deepEquals(this.customSigningKey, other.customSigningKey) &&
-            java.util.Objects.deepEquals(this.signingAlgorithm, other.signingAlgorithm) &&
-            java.util.Objects.deepEquals(this.signingKey, other.signingKey);
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.claims, other.claims) &&
+            Objects.deepEquals(this.lifetime, other.lifetime) &&
+            Objects.deepEquals(this.allowedClockSkew, other.allowedClockSkew) &&
+            Objects.deepEquals(this.customSigningKey, other.customSigningKey) &&
+            Objects.deepEquals(this.signingAlgorithm, other.signingAlgorithm) &&
+            Objects.deepEquals(this.signingKey, other.signingKey);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             name,
             claims,
             lifetime,
@@ -337,19 +333,19 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> name = Optional.empty();
+        private Optional<String> name = Optional.empty();
  
         private Optional<? extends Claims> claims = Optional.empty();
  
-        private JsonNullable<? extends Double> lifetime = JsonNullable.undefined();
+        private JsonNullable<Double> lifetime = JsonNullable.undefined();
  
-        private JsonNullable<? extends Double> allowedClockSkew = JsonNullable.undefined();
+        private JsonNullable<Double> allowedClockSkew = JsonNullable.undefined();
  
-        private Optional<? extends Boolean> customSigningKey = Optional.empty();
+        private Optional<Boolean> customSigningKey = Optional.empty();
  
-        private JsonNullable<? extends String> signingAlgorithm = JsonNullable.undefined();
+        private JsonNullable<String> signingAlgorithm = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> signingKey = JsonNullable.undefined();  
+        private JsonNullable<String> signingKey = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -367,7 +363,7 @@ public Builder name(String name) {
         /**
          * JWT template name
          */
-        public Builder name(Optional<? extends String> name) {
+        public Builder name(Optional<String> name) {
             Utils.checkNotNull(name, "name");
             this.name = name;
             return this;
@@ -403,7 +399,7 @@ public Builder lifetime(double lifetime) {
         /**
          * JWT token lifetime
          */
-        public Builder lifetime(JsonNullable<? extends Double> lifetime) {
+        public Builder lifetime(JsonNullable<Double> lifetime) {
             Utils.checkNotNull(lifetime, "lifetime");
             this.lifetime = lifetime;
             return this;
@@ -421,7 +417,7 @@ public Builder allowedClockSkew(double allowedClockSkew) {
         /**
          * JWT token allowed clock skew
          */
-        public Builder allowedClockSkew(JsonNullable<? extends Double> allowedClockSkew) {
+        public Builder allowedClockSkew(JsonNullable<Double> allowedClockSkew) {
             Utils.checkNotNull(allowedClockSkew, "allowedClockSkew");
             this.allowedClockSkew = allowedClockSkew;
             return this;
@@ -439,7 +435,7 @@ public Builder customSigningKey(boolean customSigningKey) {
         /**
          * Whether a custom signing key/algorithm is also provided for this template
          */
-        public Builder customSigningKey(Optional<? extends Boolean> customSigningKey) {
+        public Builder customSigningKey(Optional<Boolean> customSigningKey) {
             Utils.checkNotNull(customSigningKey, "customSigningKey");
             this.customSigningKey = customSigningKey;
             return this;
@@ -457,7 +453,7 @@ public Builder signingAlgorithm(String signingAlgorithm) {
         /**
          * The custom signing algorithm to use when minting JWTs
          */
-        public Builder signingAlgorithm(JsonNullable<? extends String> signingAlgorithm) {
+        public Builder signingAlgorithm(JsonNullable<String> signingAlgorithm) {
             Utils.checkNotNull(signingAlgorithm, "signingAlgorithm");
             this.signingAlgorithm = signingAlgorithm;
             return this;
@@ -475,7 +471,7 @@ public Builder signingKey(String signingKey) {
         /**
          * The custom signing private key to use when minting JWTs
          */
-        public Builder signingKey(JsonNullable<? extends String> signingKey) {
+        public Builder signingKey(JsonNullable<String> signingKey) {
             Utils.checkNotNull(signingKey, "signingKey");
             this.signingKey = signingKey;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateJWTTemplateRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateJWTTemplateRequestBuilder.java
index eee6f61..9569ca2 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateJWTTemplateRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateJWTTemplateRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreateJWTTemplateRequestBuilder {
 
@@ -26,13 +16,13 @@ public CreateJWTTemplateRequestBuilder(SDKMethodInterfaces.MethodCallCreateJWTTe
         this.sdk = sdk;
     }
                 
-    public CreateJWTTemplateRequestBuilder request(CreateJWTTemplateRequestBody request) {
+    public CreateJWTTemplateRequestBuilder request(com.clerk.backend_api.models.operations.CreateJWTTemplateRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public CreateJWTTemplateRequestBuilder request(Optional<? extends CreateJWTTemplateRequestBody> request) {
+    public CreateJWTTemplateRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.CreateJWTTemplateRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateJWTTemplateResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateJWTTemplateResponse.java
index bc13c38..fe3767e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateJWTTemplateResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateJWTTemplateResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.JWTTemplate;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateJWTTemplateResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateJWTTemplateResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateJWTTemplateResponse implements com.clerk.backend_api.utils.Re
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate;
+    private Optional<? extends JWTTemplate> jwtTemplate;
 
     @JsonCreator
     public CreateJWTTemplateResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate) {
+            Optional<? extends JWTTemplate> jwtTemplate) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate() {
-        return (Optional<com.clerk.backend_api.models.components.JWTTemplate>) jwtTemplate;
+    public Optional<JWTTemplate> jwtTemplate() {
+        return (Optional<JWTTemplate>) jwtTemplate;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateJWTTemplateResponse withRawResponse(HttpResponse<InputStream> rawRe
     /**
      * Success
      */
-    public CreateJWTTemplateResponse withJWTTemplate(com.clerk.backend_api.models.components.JWTTemplate jwtTemplate) {
+    public CreateJWTTemplateResponse withJWTTemplate(JWTTemplate jwtTemplate) {
         Utils.checkNotNull(jwtTemplate, "jwtTemplate");
         this.jwtTemplate = Optional.ofNullable(jwtTemplate);
         return this;
@@ -137,7 +141,7 @@ public CreateJWTTemplateResponse withJWTTemplate(com.clerk.backend_api.models.co
     /**
      * Success
      */
-    public CreateJWTTemplateResponse withJWTTemplate(Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate) {
+    public CreateJWTTemplateResponse withJWTTemplate(Optional<? extends JWTTemplate> jwtTemplate) {
         Utils.checkNotNull(jwtTemplate, "jwtTemplate");
         this.jwtTemplate = jwtTemplate;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateJWTTemplateResponse other = (CreateJWTTemplateResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.jwtTemplate, other.jwtTemplate);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.jwtTemplate, other.jwtTemplate);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate = Optional.empty();  
+        private Optional<? extends JWTTemplate> jwtTemplate = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder jwtTemplate(com.clerk.backend_api.models.components.JWTTemplate jwtTemplate) {
+        public Builder jwtTemplate(JWTTemplate jwtTemplate) {
             Utils.checkNotNull(jwtTemplate, "jwtTemplate");
             this.jwtTemplate = Optional.ofNullable(jwtTemplate);
             return this;
@@ -230,7 +234,7 @@ public Builder jwtTemplate(com.clerk.backend_api.models.components.JWTTemplate j
         /**
          * Success
          */
-        public Builder jwtTemplate(Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate) {
+        public Builder jwtTemplate(Optional<? extends JWTTemplate> jwtTemplate) {
             Utils.checkNotNull(jwtTemplate, "jwtTemplate");
             this.jwtTemplate = jwtTemplate;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOAuthApplicationRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOAuthApplicationRequestBody.java
index c75bad5..7e23886 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOAuthApplicationRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOAuthApplicationRequestBody.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class CreateOAuthApplicationRequestBody {
 
     /**
@@ -38,7 +39,7 @@ public class CreateOAuthApplicationRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("scopes")
-    private Optional<? extends String> scopes;
+    private Optional<String> scopes;
 
     /**
      * If true, this client is public and cannot securely store a client secret.
@@ -47,14 +48,14 @@ public class CreateOAuthApplicationRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("public")
-    private Optional<? extends Boolean> public_;
+    private Optional<Boolean> public_;
 
     @JsonCreator
     public CreateOAuthApplicationRequestBody(
             @JsonProperty("name") String name,
             @JsonProperty("callback_url") String callbackUrl,
-            @JsonProperty("scopes") Optional<? extends String> scopes,
-            @JsonProperty("public") Optional<? extends Boolean> public_) {
+            @JsonProperty("scopes") Optional<String> scopes,
+            @JsonProperty("public") Optional<Boolean> public_) {
         Utils.checkNotNull(name, "name");
         Utils.checkNotNull(callbackUrl, "callbackUrl");
         Utils.checkNotNull(scopes, "scopes");
@@ -90,10 +91,9 @@ public String callbackUrl() {
     /**
      * Define the allowed scopes for the new OAuth applications that dictate the user payload of the OAuth user info endpoint. Available scopes are `profile`, `email`, `public_metadata`, `private_metadata`. Provide the requested scopes as a string, separated by spaces.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> scopes() {
-        return (Optional<String>) scopes;
+        return scopes;
     }
 
     /**
@@ -101,10 +101,9 @@ public Optional<String> scopes() {
      * Only the authorization code flow with proof key for code exchange (PKCE) may be used.
      * Public clients cannot be updated to be confidential clients, and vice versa.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> public_() {
-        return (Optional<Boolean>) public_;
+        return public_;
     }
 
     public final static Builder builder() {
@@ -141,7 +140,7 @@ public CreateOAuthApplicationRequestBody withScopes(String scopes) {
     /**
      * Define the allowed scopes for the new OAuth applications that dictate the user payload of the OAuth user info endpoint. Available scopes are `profile`, `email`, `public_metadata`, `private_metadata`. Provide the requested scopes as a string, separated by spaces.
      */
-    public CreateOAuthApplicationRequestBody withScopes(Optional<? extends String> scopes) {
+    public CreateOAuthApplicationRequestBody withScopes(Optional<String> scopes) {
         Utils.checkNotNull(scopes, "scopes");
         this.scopes = scopes;
         return this;
@@ -163,7 +162,7 @@ public CreateOAuthApplicationRequestBody withPublic(boolean public_) {
      * Only the authorization code flow with proof key for code exchange (PKCE) may be used.
      * Public clients cannot be updated to be confidential clients, and vice versa.
      */
-    public CreateOAuthApplicationRequestBody withPublic(Optional<? extends Boolean> public_) {
+    public CreateOAuthApplicationRequestBody withPublic(Optional<Boolean> public_) {
         Utils.checkNotNull(public_, "public_");
         this.public_ = public_;
         return this;
@@ -179,15 +178,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateOAuthApplicationRequestBody other = (CreateOAuthApplicationRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.callbackUrl, other.callbackUrl) &&
-            java.util.Objects.deepEquals(this.scopes, other.scopes) &&
-            java.util.Objects.deepEquals(this.public_, other.public_);
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.callbackUrl, other.callbackUrl) &&
+            Objects.deepEquals(this.scopes, other.scopes) &&
+            Objects.deepEquals(this.public_, other.public_);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             name,
             callbackUrl,
             scopes,
@@ -209,9 +208,9 @@ public final static class Builder {
  
         private String callbackUrl;
  
-        private Optional<? extends String> scopes;
+        private Optional<String> scopes;
  
-        private Optional<? extends Boolean> public_ = Optional.empty();  
+        private Optional<Boolean> public_ = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -247,7 +246,7 @@ public Builder scopes(String scopes) {
         /**
          * Define the allowed scopes for the new OAuth applications that dictate the user payload of the OAuth user info endpoint. Available scopes are `profile`, `email`, `public_metadata`, `private_metadata`. Provide the requested scopes as a string, separated by spaces.
          */
-        public Builder scopes(Optional<? extends String> scopes) {
+        public Builder scopes(Optional<String> scopes) {
             Utils.checkNotNull(scopes, "scopes");
             this.scopes = scopes;
             return this;
@@ -269,7 +268,7 @@ public Builder public_(boolean public_) {
          * Only the authorization code flow with proof key for code exchange (PKCE) may be used.
          * Public clients cannot be updated to be confidential clients, and vice versa.
          */
-        public Builder public_(Optional<? extends Boolean> public_) {
+        public Builder public_(Optional<Boolean> public_) {
             Utils.checkNotNull(public_, "public_");
             this.public_ = public_;
             return this;
@@ -286,11 +285,11 @@ public CreateOAuthApplicationRequestBody build() {
                 public_);
         }
 
-        private static final LazySingletonValue<Optional<? extends String>> _SINGLETON_VALUE_Scopes =
+        private static final LazySingletonValue<Optional<String>> _SINGLETON_VALUE_Scopes =
                 new LazySingletonValue<>(
                         "scopes",
                         "\"profile email\"",
-                        new TypeReference<Optional<? extends String>>() {});
+                        new TypeReference<Optional<String>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOAuthApplicationRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOAuthApplicationRequestBuilder.java
index a92d16e..efa6319 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOAuthApplicationRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOAuthApplicationRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreateOAuthApplicationRequestBuilder {
 
@@ -26,13 +16,13 @@ public CreateOAuthApplicationRequestBuilder(SDKMethodInterfaces.MethodCallCreate
         this.sdk = sdk;
     }
                 
-    public CreateOAuthApplicationRequestBuilder request(CreateOAuthApplicationRequestBody request) {
+    public CreateOAuthApplicationRequestBuilder request(com.clerk.backend_api.models.operations.CreateOAuthApplicationRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public CreateOAuthApplicationRequestBuilder request(Optional<? extends CreateOAuthApplicationRequestBody> request) {
+    public CreateOAuthApplicationRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.CreateOAuthApplicationRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOAuthApplicationResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOAuthApplicationResponse.java
index b073dda..7cc9bd2 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOAuthApplicationResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOAuthApplicationResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OAuthApplicationWithSecret;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateOAuthApplicationResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateOAuthApplicationResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateOAuthApplicationResponse implements com.clerk.backend_api.uti
     /**
      * An OAuth application with client secret
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OAuthApplicationWithSecret> oAuthApplicationWithSecret;
+    private Optional<? extends OAuthApplicationWithSecret> oAuthApplicationWithSecret;
 
     @JsonCreator
     public CreateOAuthApplicationResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OAuthApplicationWithSecret> oAuthApplicationWithSecret) {
+            Optional<? extends OAuthApplicationWithSecret> oAuthApplicationWithSecret) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OAuthApplicationWithSecret> oAuthApplicationWithSecret() {
-        return (Optional<com.clerk.backend_api.models.components.OAuthApplicationWithSecret>) oAuthApplicationWithSecret;
+    public Optional<OAuthApplicationWithSecret> oAuthApplicationWithSecret() {
+        return (Optional<OAuthApplicationWithSecret>) oAuthApplicationWithSecret;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateOAuthApplicationResponse withRawResponse(HttpResponse<InputStream>
     /**
      * An OAuth application with client secret
      */
-    public CreateOAuthApplicationResponse withOAuthApplicationWithSecret(com.clerk.backend_api.models.components.OAuthApplicationWithSecret oAuthApplicationWithSecret) {
+    public CreateOAuthApplicationResponse withOAuthApplicationWithSecret(OAuthApplicationWithSecret oAuthApplicationWithSecret) {
         Utils.checkNotNull(oAuthApplicationWithSecret, "oAuthApplicationWithSecret");
         this.oAuthApplicationWithSecret = Optional.ofNullable(oAuthApplicationWithSecret);
         return this;
@@ -137,7 +141,7 @@ public CreateOAuthApplicationResponse withOAuthApplicationWithSecret(com.clerk.b
     /**
      * An OAuth application with client secret
      */
-    public CreateOAuthApplicationResponse withOAuthApplicationWithSecret(Optional<? extends com.clerk.backend_api.models.components.OAuthApplicationWithSecret> oAuthApplicationWithSecret) {
+    public CreateOAuthApplicationResponse withOAuthApplicationWithSecret(Optional<? extends OAuthApplicationWithSecret> oAuthApplicationWithSecret) {
         Utils.checkNotNull(oAuthApplicationWithSecret, "oAuthApplicationWithSecret");
         this.oAuthApplicationWithSecret = oAuthApplicationWithSecret;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateOAuthApplicationResponse other = (CreateOAuthApplicationResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.oAuthApplicationWithSecret, other.oAuthApplicationWithSecret);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.oAuthApplicationWithSecret, other.oAuthApplicationWithSecret);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OAuthApplicationWithSecret> oAuthApplicationWithSecret = Optional.empty();  
+        private Optional<? extends OAuthApplicationWithSecret> oAuthApplicationWithSecret = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * An OAuth application with client secret
          */
-        public Builder oAuthApplicationWithSecret(com.clerk.backend_api.models.components.OAuthApplicationWithSecret oAuthApplicationWithSecret) {
+        public Builder oAuthApplicationWithSecret(OAuthApplicationWithSecret oAuthApplicationWithSecret) {
             Utils.checkNotNull(oAuthApplicationWithSecret, "oAuthApplicationWithSecret");
             this.oAuthApplicationWithSecret = Optional.ofNullable(oAuthApplicationWithSecret);
             return this;
@@ -230,7 +234,7 @@ public Builder oAuthApplicationWithSecret(com.clerk.backend_api.models.component
         /**
          * An OAuth application with client secret
          */
-        public Builder oAuthApplicationWithSecret(Optional<? extends com.clerk.backend_api.models.components.OAuthApplicationWithSecret> oAuthApplicationWithSecret) {
+        public Builder oAuthApplicationWithSecret(Optional<? extends OAuthApplicationWithSecret> oAuthApplicationWithSecret) {
             Utils.checkNotNull(oAuthApplicationWithSecret, "oAuthApplicationWithSecret");
             this.oAuthApplicationWithSecret = oAuthApplicationWithSecret;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkPrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkPrivateMetadata.java
index efa3cb6..f403d39 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkPrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkPrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * CreateOrganizationInvitationBulkPrivateMetadata - Metadata saved on the organization invitation, fully accessible (read/write) from the Backend API but not visible from the Frontend API.
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkPublicMetadata.java
index e07ed3e..a3a5f15 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * CreateOrganizationInvitationBulkPublicMetadata - Metadata saved on the organization invitation, read-only from the Frontend API and fully accessible (read/write) from the Backend API.
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkRequest.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkRequest.java
index 7c14704..6a271dc 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkRequest.java
@@ -4,16 +4,16 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+
 
 public class CreateOrganizationInvitationBulkRequest {
 
@@ -24,12 +24,12 @@ public class CreateOrganizationInvitationBulkRequest {
     private String organizationId;
 
     @SpeakeasyMetadata("request:mediaType=application/json")
-    private java.util.List<RequestBody> requestBody;
+    private List<RequestBody> requestBody;
 
     @JsonCreator
     public CreateOrganizationInvitationBulkRequest(
             String organizationId,
-            java.util.List<RequestBody> requestBody) {
+            List<RequestBody> requestBody) {
         Utils.checkNotNull(organizationId, "organizationId");
         Utils.checkNotNull(requestBody, "requestBody");
         this.organizationId = organizationId;
@@ -45,7 +45,7 @@ public String organizationId() {
     }
 
     @JsonIgnore
-    public java.util.List<RequestBody> requestBody() {
+    public List<RequestBody> requestBody() {
         return requestBody;
     }
 
@@ -62,7 +62,7 @@ public CreateOrganizationInvitationBulkRequest withOrganizationId(String organiz
         return this;
     }
 
-    public CreateOrganizationInvitationBulkRequest withRequestBody(java.util.List<RequestBody> requestBody) {
+    public CreateOrganizationInvitationBulkRequest withRequestBody(List<RequestBody> requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
@@ -78,13 +78,13 @@ public boolean equals(java.lang.Object o) {
         }
         CreateOrganizationInvitationBulkRequest other = (CreateOrganizationInvitationBulkRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId,
             requestBody);
     }
@@ -100,7 +100,7 @@ public final static class Builder {
  
         private String organizationId;
  
-        private java.util.List<RequestBody> requestBody;  
+        private List<RequestBody> requestBody;  
         
         private Builder() {
           // force use of static builder() method
@@ -115,7 +115,7 @@ public Builder organizationId(String organizationId) {
             return this;
         }
 
-        public Builder requestBody(java.util.List<RequestBody> requestBody) {
+        public Builder requestBody(List<RequestBody> requestBody) {
             Utils.checkNotNull(requestBody, "requestBody");
             this.requestBody = requestBody;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkRequestBuilder.java
index 0b49ba8..ed1081c 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkRequestBuilder.java
@@ -4,36 +4,27 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
+import java.util.List;
 
 public class CreateOrganizationInvitationBulkRequestBuilder {
 
     private String organizationId;
-    private java.util.List<RequestBody> requestBody;
+    private List<RequestBody> requestBody;
     private final SDKMethodInterfaces.MethodCallCreateOrganizationInvitationBulk sdk;
 
     public CreateOrganizationInvitationBulkRequestBuilder(SDKMethodInterfaces.MethodCallCreateOrganizationInvitationBulk sdk) {
         this.sdk = sdk;
     }
 
-    public CreateOrganizationInvitationBulkRequestBuilder organizationId(String organizationId) {
+    public CreateOrganizationInvitationBulkRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
     }
 
-    public CreateOrganizationInvitationBulkRequestBuilder requestBody(java.util.List<RequestBody> requestBody) {
+    public CreateOrganizationInvitationBulkRequestBuilder requestBody(java.util.List<com.clerk.backend_api.models.operations.RequestBody> requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkResponse.java
index 871f676..30bfb90 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationBulkResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OrganizationInvitations;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateOrganizationInvitationBulkResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateOrganizationInvitationBulkResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateOrganizationInvitationBulkResponse implements com.clerk.backe
     /**
      * A list of organization invitations
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations;
+    private Optional<? extends OrganizationInvitations> organizationInvitations;
 
     @JsonCreator
     public CreateOrganizationInvitationBulkResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations) {
+            Optional<? extends OrganizationInvitations> organizationInvitations) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations() {
-        return (Optional<com.clerk.backend_api.models.components.OrganizationInvitations>) organizationInvitations;
+    public Optional<OrganizationInvitations> organizationInvitations() {
+        return (Optional<OrganizationInvitations>) organizationInvitations;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateOrganizationInvitationBulkResponse withRawResponse(HttpResponse<Inp
     /**
      * A list of organization invitations
      */
-    public CreateOrganizationInvitationBulkResponse withOrganizationInvitations(com.clerk.backend_api.models.components.OrganizationInvitations organizationInvitations) {
+    public CreateOrganizationInvitationBulkResponse withOrganizationInvitations(OrganizationInvitations organizationInvitations) {
         Utils.checkNotNull(organizationInvitations, "organizationInvitations");
         this.organizationInvitations = Optional.ofNullable(organizationInvitations);
         return this;
@@ -137,7 +141,7 @@ public CreateOrganizationInvitationBulkResponse withOrganizationInvitations(com.
     /**
      * A list of organization invitations
      */
-    public CreateOrganizationInvitationBulkResponse withOrganizationInvitations(Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations) {
+    public CreateOrganizationInvitationBulkResponse withOrganizationInvitations(Optional<? extends OrganizationInvitations> organizationInvitations) {
         Utils.checkNotNull(organizationInvitations, "organizationInvitations");
         this.organizationInvitations = organizationInvitations;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateOrganizationInvitationBulkResponse other = (CreateOrganizationInvitationBulkResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizationInvitations, other.organizationInvitations);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizationInvitations, other.organizationInvitations);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations = Optional.empty();  
+        private Optional<? extends OrganizationInvitations> organizationInvitations = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A list of organization invitations
          */
-        public Builder organizationInvitations(com.clerk.backend_api.models.components.OrganizationInvitations organizationInvitations) {
+        public Builder organizationInvitations(OrganizationInvitations organizationInvitations) {
             Utils.checkNotNull(organizationInvitations, "organizationInvitations");
             this.organizationInvitations = Optional.ofNullable(organizationInvitations);
             return this;
@@ -230,7 +234,7 @@ public Builder organizationInvitations(com.clerk.backend_api.models.components.O
         /**
          * A list of organization invitations
          */
-        public Builder organizationInvitations(Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations) {
+        public Builder organizationInvitations(Optional<? extends OrganizationInvitations> organizationInvitations) {
             Utils.checkNotNull(organizationInvitations, "organizationInvitations");
             this.organizationInvitations = organizationInvitations;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationPrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationPrivateMetadata.java
index 0790b7f..8b7ead3 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationPrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationPrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * CreateOrganizationInvitationPrivateMetadata - Metadata saved on the organization invitation, fully accessible (read/write) from the Backend API but not visible from the Frontend API.
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationPublicMetadata.java
index 2283ba7..ccffe35 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * CreateOrganizationInvitationPublicMetadata - Metadata saved on the organization invitation, read-only from the Frontend API and fully accessible (read/write) from the Backend API.
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationRequest.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationRequest.java
index d4eab2a..4b579e8 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class CreateOrganizationInvitationRequest {
 
@@ -78,13 +77,13 @@ public boolean equals(java.lang.Object o) {
         }
         CreateOrganizationInvitationRequest other = (CreateOrganizationInvitationRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationRequestBody.java
index 321fb7c..1f21f39 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationRequestBody.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class CreateOrganizationInvitationRequestBody {
 
     /**
@@ -58,7 +58,7 @@ public class CreateOrganizationInvitationRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("redirect_url")
-    private Optional<? extends String> redirectUrl;
+    private Optional<String> redirectUrl;
 
     @JsonCreator
     public CreateOrganizationInvitationRequestBody(
@@ -67,7 +67,7 @@ public CreateOrganizationInvitationRequestBody(
             @JsonProperty("role") String role,
             @JsonProperty("public_metadata") Optional<? extends CreateOrganizationInvitationPublicMetadata> publicMetadata,
             @JsonProperty("private_metadata") Optional<? extends CreateOrganizationInvitationPrivateMetadata> privateMetadata,
-            @JsonProperty("redirect_url") Optional<? extends String> redirectUrl) {
+            @JsonProperty("redirect_url") Optional<String> redirectUrl) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         Utils.checkNotNull(inviterUserId, "inviterUserId");
         Utils.checkNotNull(role, "role");
@@ -135,10 +135,9 @@ public Optional<CreateOrganizationInvitationPrivateMetadata> privateMetadata() {
     /**
      * Optional URL that the invitee will be redirected to once they accept the invitation by clicking the join link in the invitation email.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> redirectUrl() {
-        return (Optional<String>) redirectUrl;
+        return redirectUrl;
     }
 
     public final static Builder builder() {
@@ -221,7 +220,7 @@ public CreateOrganizationInvitationRequestBody withRedirectUrl(String redirectUr
     /**
      * Optional URL that the invitee will be redirected to once they accept the invitation by clicking the join link in the invitation email.
      */
-    public CreateOrganizationInvitationRequestBody withRedirectUrl(Optional<? extends String> redirectUrl) {
+    public CreateOrganizationInvitationRequestBody withRedirectUrl(Optional<String> redirectUrl) {
         Utils.checkNotNull(redirectUrl, "redirectUrl");
         this.redirectUrl = redirectUrl;
         return this;
@@ -237,17 +236,17 @@ public boolean equals(java.lang.Object o) {
         }
         CreateOrganizationInvitationRequestBody other = (CreateOrganizationInvitationRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.inviterUserId, other.inviterUserId) &&
-            java.util.Objects.deepEquals(this.role, other.role) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
-            java.util.Objects.deepEquals(this.redirectUrl, other.redirectUrl);
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.inviterUserId, other.inviterUserId) &&
+            Objects.deepEquals(this.role, other.role) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
+            Objects.deepEquals(this.redirectUrl, other.redirectUrl);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             emailAddress,
             inviterUserId,
             role,
@@ -279,7 +278,7 @@ public final static class Builder {
  
         private Optional<? extends CreateOrganizationInvitationPrivateMetadata> privateMetadata = Optional.empty();
  
-        private Optional<? extends String> redirectUrl = Optional.empty();  
+        private Optional<String> redirectUrl = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -361,7 +360,7 @@ public Builder redirectUrl(String redirectUrl) {
         /**
          * Optional URL that the invitee will be redirected to once they accept the invitation by clicking the join link in the invitation email.
          */
-        public Builder redirectUrl(Optional<? extends String> redirectUrl) {
+        public Builder redirectUrl(Optional<String> redirectUrl) {
             Utils.checkNotNull(redirectUrl, "redirectUrl");
             this.redirectUrl = redirectUrl;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationRequestBuilder.java
index 4835ad4..76d166e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class CreateOrganizationInvitationRequestBuilder {
 
@@ -27,13 +17,13 @@ public CreateOrganizationInvitationRequestBuilder(SDKMethodInterfaces.MethodCall
         this.sdk = sdk;
     }
 
-    public CreateOrganizationInvitationRequestBuilder organizationId(String organizationId) {
+    public CreateOrganizationInvitationRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
     }
 
-    public CreateOrganizationInvitationRequestBuilder requestBody(CreateOrganizationInvitationRequestBody requestBody) {
+    public CreateOrganizationInvitationRequestBuilder requestBody(com.clerk.backend_api.models.operations.CreateOrganizationInvitationRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationResponse.java
index 2d0ed7a..c7af4a9 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationInvitationResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OrganizationInvitation;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateOrganizationInvitationResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateOrganizationInvitationResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateOrganizationInvitationResponse implements com.clerk.backend_a
     /**
      * An organization invitation
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation;
+    private Optional<? extends OrganizationInvitation> organizationInvitation;
 
     @JsonCreator
     public CreateOrganizationInvitationResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation) {
+            Optional<? extends OrganizationInvitation> organizationInvitation) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation() {
-        return (Optional<com.clerk.backend_api.models.components.OrganizationInvitation>) organizationInvitation;
+    public Optional<OrganizationInvitation> organizationInvitation() {
+        return (Optional<OrganizationInvitation>) organizationInvitation;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateOrganizationInvitationResponse withRawResponse(HttpResponse<InputSt
     /**
      * An organization invitation
      */
-    public CreateOrganizationInvitationResponse withOrganizationInvitation(com.clerk.backend_api.models.components.OrganizationInvitation organizationInvitation) {
+    public CreateOrganizationInvitationResponse withOrganizationInvitation(OrganizationInvitation organizationInvitation) {
         Utils.checkNotNull(organizationInvitation, "organizationInvitation");
         this.organizationInvitation = Optional.ofNullable(organizationInvitation);
         return this;
@@ -137,7 +141,7 @@ public CreateOrganizationInvitationResponse withOrganizationInvitation(com.clerk
     /**
      * An organization invitation
      */
-    public CreateOrganizationInvitationResponse withOrganizationInvitation(Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation) {
+    public CreateOrganizationInvitationResponse withOrganizationInvitation(Optional<? extends OrganizationInvitation> organizationInvitation) {
         Utils.checkNotNull(organizationInvitation, "organizationInvitation");
         this.organizationInvitation = organizationInvitation;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateOrganizationInvitationResponse other = (CreateOrganizationInvitationResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizationInvitation, other.organizationInvitation);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizationInvitation, other.organizationInvitation);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation = Optional.empty();  
+        private Optional<? extends OrganizationInvitation> organizationInvitation = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * An organization invitation
          */
-        public Builder organizationInvitation(com.clerk.backend_api.models.components.OrganizationInvitation organizationInvitation) {
+        public Builder organizationInvitation(OrganizationInvitation organizationInvitation) {
             Utils.checkNotNull(organizationInvitation, "organizationInvitation");
             this.organizationInvitation = Optional.ofNullable(organizationInvitation);
             return this;
@@ -230,7 +234,7 @@ public Builder organizationInvitation(com.clerk.backend_api.models.components.Or
         /**
          * An organization invitation
          */
-        public Builder organizationInvitation(Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation) {
+        public Builder organizationInvitation(Optional<? extends OrganizationInvitation> organizationInvitation) {
             Utils.checkNotNull(organizationInvitation, "organizationInvitation");
             this.organizationInvitation = organizationInvitation;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipRequest.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipRequest.java
index ce2d414..62f4ec2 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class CreateOrganizationMembershipRequest {
 
@@ -78,13 +77,13 @@ public boolean equals(java.lang.Object o) {
         }
         CreateOrganizationMembershipRequest other = (CreateOrganizationMembershipRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipRequestBody.java
index 05c085c..57e3a92 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipRequestBody.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class CreateOrganizationMembershipRequestBody {
 
@@ -90,13 +89,13 @@ public boolean equals(java.lang.Object o) {
         }
         CreateOrganizationMembershipRequestBody other = (CreateOrganizationMembershipRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.role, other.role);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.role, other.role);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             role);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipRequestBuilder.java
index d9e29f5..d0820a5 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class CreateOrganizationMembershipRequestBuilder {
 
@@ -27,13 +17,13 @@ public CreateOrganizationMembershipRequestBuilder(SDKMethodInterfaces.MethodCall
         this.sdk = sdk;
     }
 
-    public CreateOrganizationMembershipRequestBuilder organizationId(String organizationId) {
+    public CreateOrganizationMembershipRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
     }
 
-    public CreateOrganizationMembershipRequestBuilder requestBody(CreateOrganizationMembershipRequestBody requestBody) {
+    public CreateOrganizationMembershipRequestBuilder requestBody(com.clerk.backend_api.models.operations.CreateOrganizationMembershipRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipResponse.java
index a6d8ba3..6bed02d 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationMembershipResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OrganizationMembership;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateOrganizationMembershipResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateOrganizationMembershipResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateOrganizationMembershipResponse implements com.clerk.backend_a
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership;
+    private Optional<? extends OrganizationMembership> organizationMembership;
 
     @JsonCreator
     public CreateOrganizationMembershipResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership) {
+            Optional<? extends OrganizationMembership> organizationMembership) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership() {
-        return (Optional<com.clerk.backend_api.models.components.OrganizationMembership>) organizationMembership;
+    public Optional<OrganizationMembership> organizationMembership() {
+        return (Optional<OrganizationMembership>) organizationMembership;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateOrganizationMembershipResponse withRawResponse(HttpResponse<InputSt
     /**
      * Success
      */
-    public CreateOrganizationMembershipResponse withOrganizationMembership(com.clerk.backend_api.models.components.OrganizationMembership organizationMembership) {
+    public CreateOrganizationMembershipResponse withOrganizationMembership(OrganizationMembership organizationMembership) {
         Utils.checkNotNull(organizationMembership, "organizationMembership");
         this.organizationMembership = Optional.ofNullable(organizationMembership);
         return this;
@@ -137,7 +141,7 @@ public CreateOrganizationMembershipResponse withOrganizationMembership(com.clerk
     /**
      * Success
      */
-    public CreateOrganizationMembershipResponse withOrganizationMembership(Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership) {
+    public CreateOrganizationMembershipResponse withOrganizationMembership(Optional<? extends OrganizationMembership> organizationMembership) {
         Utils.checkNotNull(organizationMembership, "organizationMembership");
         this.organizationMembership = organizationMembership;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateOrganizationMembershipResponse other = (CreateOrganizationMembershipResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizationMembership, other.organizationMembership);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizationMembership, other.organizationMembership);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership = Optional.empty();  
+        private Optional<? extends OrganizationMembership> organizationMembership = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder organizationMembership(com.clerk.backend_api.models.components.OrganizationMembership organizationMembership) {
+        public Builder organizationMembership(OrganizationMembership organizationMembership) {
             Utils.checkNotNull(organizationMembership, "organizationMembership");
             this.organizationMembership = Optional.ofNullable(organizationMembership);
             return this;
@@ -230,7 +234,7 @@ public Builder organizationMembership(com.clerk.backend_api.models.components.Or
         /**
          * Success
          */
-        public Builder organizationMembership(Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership) {
+        public Builder organizationMembership(Optional<? extends OrganizationMembership> organizationMembership) {
             Utils.checkNotNull(organizationMembership, "organizationMembership");
             this.organizationMembership = organizationMembership;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationPrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationPrivateMetadata.java
index 94d1969..602afc0 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationPrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationPrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * CreateOrganizationPrivateMetadata - Metadata saved on the organization, accessible only from the Backend API
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationPublicMetadata.java
index c6e85e8..3146a90 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * CreateOrganizationPublicMetadata - Metadata saved on the organization, read-only from the Frontend API and fully accessible (read/write) from the Backend API
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationRequestBody.java
index dc0e134..104ca5a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationRequestBody.java
@@ -4,20 +4,21 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class CreateOrganizationRequestBody {
 
     /**
@@ -53,14 +54,14 @@ public class CreateOrganizationRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("slug")
-    private Optional<? extends String> slug;
+    private Optional<String> slug;
 
     /**
      * The maximum number of memberships allowed for this organization
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("max_allowed_memberships")
-    private Optional<? extends Long> maxAllowedMemberships;
+    private Optional<Long> maxAllowedMemberships;
 
     @JsonCreator
     public CreateOrganizationRequestBody(
@@ -68,8 +69,8 @@ public CreateOrganizationRequestBody(
             @JsonProperty("created_by") String createdBy,
             @JsonProperty("private_metadata") Optional<? extends CreateOrganizationPrivateMetadata> privateMetadata,
             @JsonProperty("public_metadata") Optional<? extends CreateOrganizationPublicMetadata> publicMetadata,
-            @JsonProperty("slug") Optional<? extends String> slug,
-            @JsonProperty("max_allowed_memberships") Optional<? extends Long> maxAllowedMemberships) {
+            @JsonProperty("slug") Optional<String> slug,
+            @JsonProperty("max_allowed_memberships") Optional<Long> maxAllowedMemberships) {
         Utils.checkNotNull(name, "name");
         Utils.checkNotNull(createdBy, "createdBy");
         Utils.checkNotNull(privateMetadata, "privateMetadata");
@@ -129,19 +130,17 @@ public Optional<CreateOrganizationPublicMetadata> publicMetadata() {
      * Can contain only lowercase alphanumeric characters and the dash "-".
      * Must be unique for the instance.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> slug() {
-        return (Optional<String>) slug;
+        return slug;
     }
 
     /**
      * The maximum number of memberships allowed for this organization
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> maxAllowedMemberships() {
-        return (Optional<Long>) maxAllowedMemberships;
+        return maxAllowedMemberships;
     }
 
     public final static Builder builder() {
@@ -218,7 +217,7 @@ public CreateOrganizationRequestBody withSlug(String slug) {
      * Can contain only lowercase alphanumeric characters and the dash "-".
      * Must be unique for the instance.
      */
-    public CreateOrganizationRequestBody withSlug(Optional<? extends String> slug) {
+    public CreateOrganizationRequestBody withSlug(Optional<String> slug) {
         Utils.checkNotNull(slug, "slug");
         this.slug = slug;
         return this;
@@ -236,7 +235,7 @@ public CreateOrganizationRequestBody withMaxAllowedMemberships(long maxAllowedMe
     /**
      * The maximum number of memberships allowed for this organization
      */
-    public CreateOrganizationRequestBody withMaxAllowedMemberships(Optional<? extends Long> maxAllowedMemberships) {
+    public CreateOrganizationRequestBody withMaxAllowedMemberships(Optional<Long> maxAllowedMemberships) {
         Utils.checkNotNull(maxAllowedMemberships, "maxAllowedMemberships");
         this.maxAllowedMemberships = maxAllowedMemberships;
         return this;
@@ -252,17 +251,17 @@ public boolean equals(java.lang.Object o) {
         }
         CreateOrganizationRequestBody other = (CreateOrganizationRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.createdBy, other.createdBy) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.slug, other.slug) &&
-            java.util.Objects.deepEquals(this.maxAllowedMemberships, other.maxAllowedMemberships);
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.createdBy, other.createdBy) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.slug, other.slug) &&
+            Objects.deepEquals(this.maxAllowedMemberships, other.maxAllowedMemberships);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             name,
             createdBy,
             privateMetadata,
@@ -292,9 +291,9 @@ public final static class Builder {
  
         private Optional<? extends CreateOrganizationPublicMetadata> publicMetadata = Optional.empty();
  
-        private Optional<? extends String> slug = Optional.empty();
+        private Optional<String> slug = Optional.empty();
  
-        private Optional<? extends Long> maxAllowedMemberships = Optional.empty();  
+        private Optional<Long> maxAllowedMemberships = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -370,7 +369,7 @@ public Builder slug(String slug) {
          * Can contain only lowercase alphanumeric characters and the dash "-".
          * Must be unique for the instance.
          */
-        public Builder slug(Optional<? extends String> slug) {
+        public Builder slug(Optional<String> slug) {
             Utils.checkNotNull(slug, "slug");
             this.slug = slug;
             return this;
@@ -388,7 +387,7 @@ public Builder maxAllowedMemberships(long maxAllowedMemberships) {
         /**
          * The maximum number of memberships allowed for this organization
          */
-        public Builder maxAllowedMemberships(Optional<? extends Long> maxAllowedMemberships) {
+        public Builder maxAllowedMemberships(Optional<Long> maxAllowedMemberships) {
             Utils.checkNotNull(maxAllowedMemberships, "maxAllowedMemberships");
             this.maxAllowedMemberships = maxAllowedMemberships;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationRequestBuilder.java
index d0383a4..facf0d4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreateOrganizationRequestBuilder {
 
@@ -26,13 +16,13 @@ public CreateOrganizationRequestBuilder(SDKMethodInterfaces.MethodCallCreateOrga
         this.sdk = sdk;
     }
                 
-    public CreateOrganizationRequestBuilder request(CreateOrganizationRequestBody request) {
+    public CreateOrganizationRequestBuilder request(com.clerk.backend_api.models.operations.CreateOrganizationRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public CreateOrganizationRequestBuilder request(Optional<? extends CreateOrganizationRequestBody> request) {
+    public CreateOrganizationRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.CreateOrganizationRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationResponse.java
index 3233dab..29f132e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateOrganizationResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Organization;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateOrganizationResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateOrganizationResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateOrganizationResponse implements com.clerk.backend_api.utils.R
     /**
      * An organization
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Organization> organization;
+    private Optional<? extends Organization> organization;
 
     @JsonCreator
     public CreateOrganizationResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+            Optional<? extends Organization> organization) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Organization> organization() {
-        return (Optional<com.clerk.backend_api.models.components.Organization>) organization;
+    public Optional<Organization> organization() {
+        return (Optional<Organization>) organization;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateOrganizationResponse withRawResponse(HttpResponse<InputStream> rawR
     /**
      * An organization
      */
-    public CreateOrganizationResponse withOrganization(com.clerk.backend_api.models.components.Organization organization) {
+    public CreateOrganizationResponse withOrganization(Organization organization) {
         Utils.checkNotNull(organization, "organization");
         this.organization = Optional.ofNullable(organization);
         return this;
@@ -137,7 +141,7 @@ public CreateOrganizationResponse withOrganization(com.clerk.backend_api.models.
     /**
      * An organization
      */
-    public CreateOrganizationResponse withOrganization(Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+    public CreateOrganizationResponse withOrganization(Optional<? extends Organization> organization) {
         Utils.checkNotNull(organization, "organization");
         this.organization = organization;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateOrganizationResponse other = (CreateOrganizationResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organization, other.organization);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organization, other.organization);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Organization> organization = Optional.empty();  
+        private Optional<? extends Organization> organization = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * An organization
          */
-        public Builder organization(com.clerk.backend_api.models.components.Organization organization) {
+        public Builder organization(Organization organization) {
             Utils.checkNotNull(organization, "organization");
             this.organization = Optional.ofNullable(organization);
             return this;
@@ -230,7 +234,7 @@ public Builder organization(com.clerk.backend_api.models.components.Organization
         /**
          * An organization
          */
-        public Builder organization(Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+        public Builder organization(Optional<? extends Organization> organization) {
             Utils.checkNotNull(organization, "organization");
             this.organization = organization;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreatePhoneNumberRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreatePhoneNumberRequestBody.java
index aaac9c7..4fc63db 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreatePhoneNumberRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreatePhoneNumberRequestBody.java
@@ -4,21 +4,21 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class CreatePhoneNumberRequestBody {
 
     /**
@@ -26,21 +26,21 @@ public class CreatePhoneNumberRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("user_id")
-    private Optional<? extends String> userId;
+    private Optional<String> userId;
 
     /**
      * The new phone number. Must adhere to the E.164 standard for phone number format.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("phone_number")
-    private Optional<? extends String> phoneNumber;
+    private Optional<String> phoneNumber;
 
     /**
      * When created, the phone number will be marked as verified.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("verified")
-    private JsonNullable<? extends Boolean> verified;
+    private JsonNullable<Boolean> verified;
 
     /**
      * Create this phone number as the primary phone number for the user.
@@ -48,7 +48,7 @@ public class CreatePhoneNumberRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("primary")
-    private JsonNullable<? extends Boolean> primary;
+    private JsonNullable<Boolean> primary;
 
     /**
      * Create this phone number as reserved for multi-factor authentication.
@@ -57,15 +57,15 @@ public class CreatePhoneNumberRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("reserved_for_second_factor")
-    private JsonNullable<? extends Boolean> reservedForSecondFactor;
+    private JsonNullable<Boolean> reservedForSecondFactor;
 
     @JsonCreator
     public CreatePhoneNumberRequestBody(
-            @JsonProperty("user_id") Optional<? extends String> userId,
-            @JsonProperty("phone_number") Optional<? extends String> phoneNumber,
-            @JsonProperty("verified") JsonNullable<? extends Boolean> verified,
-            @JsonProperty("primary") JsonNullable<? extends Boolean> primary,
-            @JsonProperty("reserved_for_second_factor") JsonNullable<? extends Boolean> reservedForSecondFactor) {
+            @JsonProperty("user_id") Optional<String> userId,
+            @JsonProperty("phone_number") Optional<String> phoneNumber,
+            @JsonProperty("verified") JsonNullable<Boolean> verified,
+            @JsonProperty("primary") JsonNullable<Boolean> primary,
+            @JsonProperty("reserved_for_second_factor") JsonNullable<Boolean> reservedForSecondFactor) {
         Utils.checkNotNull(userId, "userId");
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         Utils.checkNotNull(verified, "verified");
@@ -85,38 +85,34 @@ public CreatePhoneNumberRequestBody() {
     /**
      * The ID representing the user
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> userId() {
-        return (Optional<String>) userId;
+        return userId;
     }
 
     /**
      * The new phone number. Must adhere to the E.164 standard for phone number format.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> phoneNumber() {
-        return (Optional<String>) phoneNumber;
+        return phoneNumber;
     }
 
     /**
      * When created, the phone number will be marked as verified.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> verified() {
-        return (JsonNullable<Boolean>) verified;
+        return verified;
     }
 
     /**
      * Create this phone number as the primary phone number for the user.
      * Default: false, unless it is the first phone number.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> primary() {
-        return (JsonNullable<Boolean>) primary;
+        return primary;
     }
 
     /**
@@ -124,10 +120,9 @@ public JsonNullable<Boolean> primary() {
      * The phone number must also be verified.
      * If there are no other reserved second factors, the phone number will be set as the default second factor.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> reservedForSecondFactor() {
-        return (JsonNullable<Boolean>) reservedForSecondFactor;
+        return reservedForSecondFactor;
     }
 
     public final static Builder builder() {
@@ -146,7 +141,7 @@ public CreatePhoneNumberRequestBody withUserId(String userId) {
     /**
      * The ID representing the user
      */
-    public CreatePhoneNumberRequestBody withUserId(Optional<? extends String> userId) {
+    public CreatePhoneNumberRequestBody withUserId(Optional<String> userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
@@ -164,7 +159,7 @@ public CreatePhoneNumberRequestBody withPhoneNumber(String phoneNumber) {
     /**
      * The new phone number. Must adhere to the E.164 standard for phone number format.
      */
-    public CreatePhoneNumberRequestBody withPhoneNumber(Optional<? extends String> phoneNumber) {
+    public CreatePhoneNumberRequestBody withPhoneNumber(Optional<String> phoneNumber) {
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         this.phoneNumber = phoneNumber;
         return this;
@@ -182,7 +177,7 @@ public CreatePhoneNumberRequestBody withVerified(boolean verified) {
     /**
      * When created, the phone number will be marked as verified.
      */
-    public CreatePhoneNumberRequestBody withVerified(JsonNullable<? extends Boolean> verified) {
+    public CreatePhoneNumberRequestBody withVerified(JsonNullable<Boolean> verified) {
         Utils.checkNotNull(verified, "verified");
         this.verified = verified;
         return this;
@@ -202,7 +197,7 @@ public CreatePhoneNumberRequestBody withPrimary(boolean primary) {
      * Create this phone number as the primary phone number for the user.
      * Default: false, unless it is the first phone number.
      */
-    public CreatePhoneNumberRequestBody withPrimary(JsonNullable<? extends Boolean> primary) {
+    public CreatePhoneNumberRequestBody withPrimary(JsonNullable<Boolean> primary) {
         Utils.checkNotNull(primary, "primary");
         this.primary = primary;
         return this;
@@ -224,7 +219,7 @@ public CreatePhoneNumberRequestBody withReservedForSecondFactor(boolean reserved
      * The phone number must also be verified.
      * If there are no other reserved second factors, the phone number will be set as the default second factor.
      */
-    public CreatePhoneNumberRequestBody withReservedForSecondFactor(JsonNullable<? extends Boolean> reservedForSecondFactor) {
+    public CreatePhoneNumberRequestBody withReservedForSecondFactor(JsonNullable<Boolean> reservedForSecondFactor) {
         Utils.checkNotNull(reservedForSecondFactor, "reservedForSecondFactor");
         this.reservedForSecondFactor = reservedForSecondFactor;
         return this;
@@ -240,16 +235,16 @@ public boolean equals(java.lang.Object o) {
         }
         CreatePhoneNumberRequestBody other = (CreatePhoneNumberRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.phoneNumber, other.phoneNumber) &&
-            java.util.Objects.deepEquals(this.verified, other.verified) &&
-            java.util.Objects.deepEquals(this.primary, other.primary) &&
-            java.util.Objects.deepEquals(this.reservedForSecondFactor, other.reservedForSecondFactor);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.phoneNumber, other.phoneNumber) &&
+            Objects.deepEquals(this.verified, other.verified) &&
+            Objects.deepEquals(this.primary, other.primary) &&
+            Objects.deepEquals(this.reservedForSecondFactor, other.reservedForSecondFactor);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             phoneNumber,
             verified,
@@ -269,15 +264,15 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> userId = Optional.empty();
+        private Optional<String> userId = Optional.empty();
  
-        private Optional<? extends String> phoneNumber = Optional.empty();
+        private Optional<String> phoneNumber = Optional.empty();
  
-        private JsonNullable<? extends Boolean> verified = JsonNullable.undefined();
+        private JsonNullable<Boolean> verified = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> primary = JsonNullable.undefined();
+        private JsonNullable<Boolean> primary = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> reservedForSecondFactor = JsonNullable.undefined();  
+        private JsonNullable<Boolean> reservedForSecondFactor = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -295,7 +290,7 @@ public Builder userId(String userId) {
         /**
          * The ID representing the user
          */
-        public Builder userId(Optional<? extends String> userId) {
+        public Builder userId(Optional<String> userId) {
             Utils.checkNotNull(userId, "userId");
             this.userId = userId;
             return this;
@@ -313,7 +308,7 @@ public Builder phoneNumber(String phoneNumber) {
         /**
          * The new phone number. Must adhere to the E.164 standard for phone number format.
          */
-        public Builder phoneNumber(Optional<? extends String> phoneNumber) {
+        public Builder phoneNumber(Optional<String> phoneNumber) {
             Utils.checkNotNull(phoneNumber, "phoneNumber");
             this.phoneNumber = phoneNumber;
             return this;
@@ -331,7 +326,7 @@ public Builder verified(boolean verified) {
         /**
          * When created, the phone number will be marked as verified.
          */
-        public Builder verified(JsonNullable<? extends Boolean> verified) {
+        public Builder verified(JsonNullable<Boolean> verified) {
             Utils.checkNotNull(verified, "verified");
             this.verified = verified;
             return this;
@@ -351,7 +346,7 @@ public Builder primary(boolean primary) {
          * Create this phone number as the primary phone number for the user.
          * Default: false, unless it is the first phone number.
          */
-        public Builder primary(JsonNullable<? extends Boolean> primary) {
+        public Builder primary(JsonNullable<Boolean> primary) {
             Utils.checkNotNull(primary, "primary");
             this.primary = primary;
             return this;
@@ -373,7 +368,7 @@ public Builder reservedForSecondFactor(boolean reservedForSecondFactor) {
          * The phone number must also be verified.
          * If there are no other reserved second factors, the phone number will be set as the default second factor.
          */
-        public Builder reservedForSecondFactor(JsonNullable<? extends Boolean> reservedForSecondFactor) {
+        public Builder reservedForSecondFactor(JsonNullable<Boolean> reservedForSecondFactor) {
             Utils.checkNotNull(reservedForSecondFactor, "reservedForSecondFactor");
             this.reservedForSecondFactor = reservedForSecondFactor;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreatePhoneNumberRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreatePhoneNumberRequestBuilder.java
index 31a4905..ea3ee98 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreatePhoneNumberRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreatePhoneNumberRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreatePhoneNumberRequestBuilder {
 
@@ -26,13 +16,13 @@ public CreatePhoneNumberRequestBuilder(SDKMethodInterfaces.MethodCallCreatePhone
         this.sdk = sdk;
     }
                 
-    public CreatePhoneNumberRequestBuilder request(CreatePhoneNumberRequestBody request) {
+    public CreatePhoneNumberRequestBuilder request(com.clerk.backend_api.models.operations.CreatePhoneNumberRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public CreatePhoneNumberRequestBuilder request(Optional<? extends CreatePhoneNumberRequestBody> request) {
+    public CreatePhoneNumberRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.CreatePhoneNumberRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreatePhoneNumberResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreatePhoneNumberResponse.java
index d616391..5f3b058 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreatePhoneNumberResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreatePhoneNumberResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.PhoneNumber;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreatePhoneNumberResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreatePhoneNumberResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreatePhoneNumberResponse implements com.clerk.backend_api.utils.Re
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber;
+    private Optional<? extends PhoneNumber> phoneNumber;
 
     @JsonCreator
     public CreatePhoneNumberResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber) {
+            Optional<? extends PhoneNumber> phoneNumber) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.PhoneNumber> phoneNumber() {
-        return (Optional<com.clerk.backend_api.models.components.PhoneNumber>) phoneNumber;
+    public Optional<PhoneNumber> phoneNumber() {
+        return (Optional<PhoneNumber>) phoneNumber;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreatePhoneNumberResponse withRawResponse(HttpResponse<InputStream> rawRe
     /**
      * Success
      */
-    public CreatePhoneNumberResponse withPhoneNumber(com.clerk.backend_api.models.components.PhoneNumber phoneNumber) {
+    public CreatePhoneNumberResponse withPhoneNumber(PhoneNumber phoneNumber) {
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         this.phoneNumber = Optional.ofNullable(phoneNumber);
         return this;
@@ -137,7 +141,7 @@ public CreatePhoneNumberResponse withPhoneNumber(com.clerk.backend_api.models.co
     /**
      * Success
      */
-    public CreatePhoneNumberResponse withPhoneNumber(Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber) {
+    public CreatePhoneNumberResponse withPhoneNumber(Optional<? extends PhoneNumber> phoneNumber) {
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         this.phoneNumber = phoneNumber;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreatePhoneNumberResponse other = (CreatePhoneNumberResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.phoneNumber, other.phoneNumber);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.phoneNumber, other.phoneNumber);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber = Optional.empty();  
+        private Optional<? extends PhoneNumber> phoneNumber = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder phoneNumber(com.clerk.backend_api.models.components.PhoneNumber phoneNumber) {
+        public Builder phoneNumber(PhoneNumber phoneNumber) {
             Utils.checkNotNull(phoneNumber, "phoneNumber");
             this.phoneNumber = Optional.ofNullable(phoneNumber);
             return this;
@@ -230,7 +234,7 @@ public Builder phoneNumber(com.clerk.backend_api.models.components.PhoneNumber p
         /**
          * Success
          */
-        public Builder phoneNumber(Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber) {
+        public Builder phoneNumber(Optional<? extends PhoneNumber> phoneNumber) {
             Utils.checkNotNull(phoneNumber, "phoneNumber");
             this.phoneNumber = phoneNumber;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateRedirectURLRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateRedirectURLRequestBody.java
index 93c48e9..e0f1507 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateRedirectURLRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateRedirectURLRequestBody.java
@@ -4,20 +4,19 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class CreateRedirectURLRequestBody {
 
     /**
@@ -25,11 +24,11 @@ public class CreateRedirectURLRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("url")
-    private Optional<? extends String> url;
+    private Optional<String> url;
 
     @JsonCreator
     public CreateRedirectURLRequestBody(
-            @JsonProperty("url") Optional<? extends String> url) {
+            @JsonProperty("url") Optional<String> url) {
         Utils.checkNotNull(url, "url");
         this.url = url;
     }
@@ -41,10 +40,9 @@ public CreateRedirectURLRequestBody() {
     /**
      * The full url value prefixed with `https://` or a custom scheme e.g. `"https://my-app.com/oauth-callback"` or `"my-app://oauth-callback"`
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> url() {
-        return (Optional<String>) url;
+        return url;
     }
 
     public final static Builder builder() {
@@ -63,7 +61,7 @@ public CreateRedirectURLRequestBody withUrl(String url) {
     /**
      * The full url value prefixed with `https://` or a custom scheme e.g. `"https://my-app.com/oauth-callback"` or `"my-app://oauth-callback"`
      */
-    public CreateRedirectURLRequestBody withUrl(Optional<? extends String> url) {
+    public CreateRedirectURLRequestBody withUrl(Optional<String> url) {
         Utils.checkNotNull(url, "url");
         this.url = url;
         return this;
@@ -79,12 +77,12 @@ public boolean equals(java.lang.Object o) {
         }
         CreateRedirectURLRequestBody other = (CreateRedirectURLRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.url, other.url);
+            Objects.deepEquals(this.url, other.url);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             url);
     }
     
@@ -96,7 +94,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> url = Optional.empty();  
+        private Optional<String> url = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -114,7 +112,7 @@ public Builder url(String url) {
         /**
          * The full url value prefixed with `https://` or a custom scheme e.g. `"https://my-app.com/oauth-callback"` or `"my-app://oauth-callback"`
          */
-        public Builder url(Optional<? extends String> url) {
+        public Builder url(Optional<String> url) {
             Utils.checkNotNull(url, "url");
             this.url = url;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateRedirectURLRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateRedirectURLRequestBuilder.java
index 9cae491..a704816 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateRedirectURLRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateRedirectURLRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreateRedirectURLRequestBuilder {
 
@@ -26,13 +16,13 @@ public CreateRedirectURLRequestBuilder(SDKMethodInterfaces.MethodCallCreateRedir
         this.sdk = sdk;
     }
                 
-    public CreateRedirectURLRequestBuilder request(CreateRedirectURLRequestBody request) {
+    public CreateRedirectURLRequestBuilder request(com.clerk.backend_api.models.operations.CreateRedirectURLRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public CreateRedirectURLRequestBuilder request(Optional<? extends CreateRedirectURLRequestBody> request) {
+    public CreateRedirectURLRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.CreateRedirectURLRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateRedirectURLResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateRedirectURLResponse.java
index 08ebfe5..cd70aad 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateRedirectURLResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateRedirectURLResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.RedirectURL;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateRedirectURLResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateRedirectURLResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateRedirectURLResponse implements com.clerk.backend_api.utils.Re
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.RedirectURL> redirectURL;
+    private Optional<? extends RedirectURL> redirectURL;
 
     @JsonCreator
     public CreateRedirectURLResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.RedirectURL> redirectURL) {
+            Optional<? extends RedirectURL> redirectURL) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.RedirectURL> redirectURL() {
-        return (Optional<com.clerk.backend_api.models.components.RedirectURL>) redirectURL;
+    public Optional<RedirectURL> redirectURL() {
+        return (Optional<RedirectURL>) redirectURL;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateRedirectURLResponse withRawResponse(HttpResponse<InputStream> rawRe
     /**
      * Success
      */
-    public CreateRedirectURLResponse withRedirectURL(com.clerk.backend_api.models.components.RedirectURL redirectURL) {
+    public CreateRedirectURLResponse withRedirectURL(RedirectURL redirectURL) {
         Utils.checkNotNull(redirectURL, "redirectURL");
         this.redirectURL = Optional.ofNullable(redirectURL);
         return this;
@@ -137,7 +141,7 @@ public CreateRedirectURLResponse withRedirectURL(com.clerk.backend_api.models.co
     /**
      * Success
      */
-    public CreateRedirectURLResponse withRedirectURL(Optional<? extends com.clerk.backend_api.models.components.RedirectURL> redirectURL) {
+    public CreateRedirectURLResponse withRedirectURL(Optional<? extends RedirectURL> redirectURL) {
         Utils.checkNotNull(redirectURL, "redirectURL");
         this.redirectURL = redirectURL;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateRedirectURLResponse other = (CreateRedirectURLResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.redirectURL, other.redirectURL);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.redirectURL, other.redirectURL);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.RedirectURL> redirectURL = Optional.empty();  
+        private Optional<? extends RedirectURL> redirectURL = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder redirectURL(com.clerk.backend_api.models.components.RedirectURL redirectURL) {
+        public Builder redirectURL(RedirectURL redirectURL) {
             Utils.checkNotNull(redirectURL, "redirectURL");
             this.redirectURL = Optional.ofNullable(redirectURL);
             return this;
@@ -230,7 +234,7 @@ public Builder redirectURL(com.clerk.backend_api.models.components.RedirectURL r
         /**
          * Success
          */
-        public Builder redirectURL(Optional<? extends com.clerk.backend_api.models.components.RedirectURL> redirectURL) {
+        public Builder redirectURL(Optional<? extends RedirectURL> redirectURL) {
             Utils.checkNotNull(redirectURL, "redirectURL");
             this.redirectURL = redirectURL;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateSAMLConnectionRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateSAMLConnectionRequestBody.java
index 6cb6f96..a4830f8 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateSAMLConnectionRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateSAMLConnectionRequestBody.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class CreateSAMLConnectionRequestBody {
 
     /**
@@ -43,35 +43,35 @@ public class CreateSAMLConnectionRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("idp_entity_id")
-    private JsonNullable<? extends String> idpEntityId;
+    private JsonNullable<String> idpEntityId;
 
     /**
      * The Single-Sign On URL as provided by the IdP
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("idp_sso_url")
-    private JsonNullable<? extends String> idpSsoUrl;
+    private JsonNullable<String> idpSsoUrl;
 
     /**
      * The X.509 certificate as provided by the IdP
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("idp_certificate")
-    private JsonNullable<? extends String> idpCertificate;
+    private JsonNullable<String> idpCertificate;
 
     /**
      * The URL which serves the IdP metadata. If present, it takes priority over the corresponding individual properties
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("idp_metadata_url")
-    private JsonNullable<? extends String> idpMetadataUrl;
+    private JsonNullable<String> idpMetadataUrl;
 
     /**
      * The XML content of the IdP metadata file. If present, it takes priority over the corresponding individual properties
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("idp_metadata")
-    private JsonNullable<? extends String> idpMetadata;
+    private JsonNullable<String> idpMetadata;
 
     /**
      * Define the attribute name mapping between Identity Provider and Clerk's user properties
@@ -85,11 +85,11 @@ public CreateSAMLConnectionRequestBody(
             @JsonProperty("name") String name,
             @JsonProperty("domain") String domain,
             @JsonProperty("provider") Provider provider,
-            @JsonProperty("idp_entity_id") JsonNullable<? extends String> idpEntityId,
-            @JsonProperty("idp_sso_url") JsonNullable<? extends String> idpSsoUrl,
-            @JsonProperty("idp_certificate") JsonNullable<? extends String> idpCertificate,
-            @JsonProperty("idp_metadata_url") JsonNullable<? extends String> idpMetadataUrl,
-            @JsonProperty("idp_metadata") JsonNullable<? extends String> idpMetadata,
+            @JsonProperty("idp_entity_id") JsonNullable<String> idpEntityId,
+            @JsonProperty("idp_sso_url") JsonNullable<String> idpSsoUrl,
+            @JsonProperty("idp_certificate") JsonNullable<String> idpCertificate,
+            @JsonProperty("idp_metadata_url") JsonNullable<String> idpMetadataUrl,
+            @JsonProperty("idp_metadata") JsonNullable<String> idpMetadata,
             @JsonProperty("attribute_mapping") JsonNullable<? extends AttributeMapping> attributeMapping) {
         Utils.checkNotNull(name, "name");
         Utils.checkNotNull(domain, "domain");
@@ -145,46 +145,41 @@ public Provider provider() {
     /**
      * The Entity ID as provided by the IdP
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> idpEntityId() {
-        return (JsonNullable<String>) idpEntityId;
+        return idpEntityId;
     }
 
     /**
      * The Single-Sign On URL as provided by the IdP
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> idpSsoUrl() {
-        return (JsonNullable<String>) idpSsoUrl;
+        return idpSsoUrl;
     }
 
     /**
      * The X.509 certificate as provided by the IdP
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> idpCertificate() {
-        return (JsonNullable<String>) idpCertificate;
+        return idpCertificate;
     }
 
     /**
      * The URL which serves the IdP metadata. If present, it takes priority over the corresponding individual properties
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> idpMetadataUrl() {
-        return (JsonNullable<String>) idpMetadataUrl;
+        return idpMetadataUrl;
     }
 
     /**
      * The XML content of the IdP metadata file. If present, it takes priority over the corresponding individual properties
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> idpMetadata() {
-        return (JsonNullable<String>) idpMetadata;
+        return idpMetadata;
     }
 
     /**
@@ -239,7 +234,7 @@ public CreateSAMLConnectionRequestBody withIdpEntityId(String idpEntityId) {
     /**
      * The Entity ID as provided by the IdP
      */
-    public CreateSAMLConnectionRequestBody withIdpEntityId(JsonNullable<? extends String> idpEntityId) {
+    public CreateSAMLConnectionRequestBody withIdpEntityId(JsonNullable<String> idpEntityId) {
         Utils.checkNotNull(idpEntityId, "idpEntityId");
         this.idpEntityId = idpEntityId;
         return this;
@@ -257,7 +252,7 @@ public CreateSAMLConnectionRequestBody withIdpSsoUrl(String idpSsoUrl) {
     /**
      * The Single-Sign On URL as provided by the IdP
      */
-    public CreateSAMLConnectionRequestBody withIdpSsoUrl(JsonNullable<? extends String> idpSsoUrl) {
+    public CreateSAMLConnectionRequestBody withIdpSsoUrl(JsonNullable<String> idpSsoUrl) {
         Utils.checkNotNull(idpSsoUrl, "idpSsoUrl");
         this.idpSsoUrl = idpSsoUrl;
         return this;
@@ -275,7 +270,7 @@ public CreateSAMLConnectionRequestBody withIdpCertificate(String idpCertificate)
     /**
      * The X.509 certificate as provided by the IdP
      */
-    public CreateSAMLConnectionRequestBody withIdpCertificate(JsonNullable<? extends String> idpCertificate) {
+    public CreateSAMLConnectionRequestBody withIdpCertificate(JsonNullable<String> idpCertificate) {
         Utils.checkNotNull(idpCertificate, "idpCertificate");
         this.idpCertificate = idpCertificate;
         return this;
@@ -293,7 +288,7 @@ public CreateSAMLConnectionRequestBody withIdpMetadataUrl(String idpMetadataUrl)
     /**
      * The URL which serves the IdP metadata. If present, it takes priority over the corresponding individual properties
      */
-    public CreateSAMLConnectionRequestBody withIdpMetadataUrl(JsonNullable<? extends String> idpMetadataUrl) {
+    public CreateSAMLConnectionRequestBody withIdpMetadataUrl(JsonNullable<String> idpMetadataUrl) {
         Utils.checkNotNull(idpMetadataUrl, "idpMetadataUrl");
         this.idpMetadataUrl = idpMetadataUrl;
         return this;
@@ -311,7 +306,7 @@ public CreateSAMLConnectionRequestBody withIdpMetadata(String idpMetadata) {
     /**
      * The XML content of the IdP metadata file. If present, it takes priority over the corresponding individual properties
      */
-    public CreateSAMLConnectionRequestBody withIdpMetadata(JsonNullable<? extends String> idpMetadata) {
+    public CreateSAMLConnectionRequestBody withIdpMetadata(JsonNullable<String> idpMetadata) {
         Utils.checkNotNull(idpMetadata, "idpMetadata");
         this.idpMetadata = idpMetadata;
         return this;
@@ -345,20 +340,20 @@ public boolean equals(java.lang.Object o) {
         }
         CreateSAMLConnectionRequestBody other = (CreateSAMLConnectionRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.domain, other.domain) &&
-            java.util.Objects.deepEquals(this.provider, other.provider) &&
-            java.util.Objects.deepEquals(this.idpEntityId, other.idpEntityId) &&
-            java.util.Objects.deepEquals(this.idpSsoUrl, other.idpSsoUrl) &&
-            java.util.Objects.deepEquals(this.idpCertificate, other.idpCertificate) &&
-            java.util.Objects.deepEquals(this.idpMetadataUrl, other.idpMetadataUrl) &&
-            java.util.Objects.deepEquals(this.idpMetadata, other.idpMetadata) &&
-            java.util.Objects.deepEquals(this.attributeMapping, other.attributeMapping);
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.domain, other.domain) &&
+            Objects.deepEquals(this.provider, other.provider) &&
+            Objects.deepEquals(this.idpEntityId, other.idpEntityId) &&
+            Objects.deepEquals(this.idpSsoUrl, other.idpSsoUrl) &&
+            Objects.deepEquals(this.idpCertificate, other.idpCertificate) &&
+            Objects.deepEquals(this.idpMetadataUrl, other.idpMetadataUrl) &&
+            Objects.deepEquals(this.idpMetadata, other.idpMetadata) &&
+            Objects.deepEquals(this.attributeMapping, other.attributeMapping);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             name,
             domain,
             provider,
@@ -392,15 +387,15 @@ public final static class Builder {
  
         private Provider provider;
  
-        private JsonNullable<? extends String> idpEntityId = JsonNullable.undefined();
+        private JsonNullable<String> idpEntityId = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> idpSsoUrl = JsonNullable.undefined();
+        private JsonNullable<String> idpSsoUrl = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> idpCertificate = JsonNullable.undefined();
+        private JsonNullable<String> idpCertificate = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> idpMetadataUrl = JsonNullable.undefined();
+        private JsonNullable<String> idpMetadataUrl = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> idpMetadata = JsonNullable.undefined();
+        private JsonNullable<String> idpMetadata = JsonNullable.undefined();
  
         private JsonNullable<? extends AttributeMapping> attributeMapping = JsonNullable.undefined();  
         
@@ -447,7 +442,7 @@ public Builder idpEntityId(String idpEntityId) {
         /**
          * The Entity ID as provided by the IdP
          */
-        public Builder idpEntityId(JsonNullable<? extends String> idpEntityId) {
+        public Builder idpEntityId(JsonNullable<String> idpEntityId) {
             Utils.checkNotNull(idpEntityId, "idpEntityId");
             this.idpEntityId = idpEntityId;
             return this;
@@ -465,7 +460,7 @@ public Builder idpSsoUrl(String idpSsoUrl) {
         /**
          * The Single-Sign On URL as provided by the IdP
          */
-        public Builder idpSsoUrl(JsonNullable<? extends String> idpSsoUrl) {
+        public Builder idpSsoUrl(JsonNullable<String> idpSsoUrl) {
             Utils.checkNotNull(idpSsoUrl, "idpSsoUrl");
             this.idpSsoUrl = idpSsoUrl;
             return this;
@@ -483,7 +478,7 @@ public Builder idpCertificate(String idpCertificate) {
         /**
          * The X.509 certificate as provided by the IdP
          */
-        public Builder idpCertificate(JsonNullable<? extends String> idpCertificate) {
+        public Builder idpCertificate(JsonNullable<String> idpCertificate) {
             Utils.checkNotNull(idpCertificate, "idpCertificate");
             this.idpCertificate = idpCertificate;
             return this;
@@ -501,7 +496,7 @@ public Builder idpMetadataUrl(String idpMetadataUrl) {
         /**
          * The URL which serves the IdP metadata. If present, it takes priority over the corresponding individual properties
          */
-        public Builder idpMetadataUrl(JsonNullable<? extends String> idpMetadataUrl) {
+        public Builder idpMetadataUrl(JsonNullable<String> idpMetadataUrl) {
             Utils.checkNotNull(idpMetadataUrl, "idpMetadataUrl");
             this.idpMetadataUrl = idpMetadataUrl;
             return this;
@@ -519,7 +514,7 @@ public Builder idpMetadata(String idpMetadata) {
         /**
          * The XML content of the IdP metadata file. If present, it takes priority over the corresponding individual properties
          */
-        public Builder idpMetadata(JsonNullable<? extends String> idpMetadata) {
+        public Builder idpMetadata(JsonNullable<String> idpMetadata) {
             Utils.checkNotNull(idpMetadata, "idpMetadata");
             this.idpMetadata = idpMetadata;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateSAMLConnectionRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateSAMLConnectionRequestBuilder.java
index ba98fa1..22bbde4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateSAMLConnectionRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateSAMLConnectionRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreateSAMLConnectionRequestBuilder {
 
@@ -26,13 +16,13 @@ public CreateSAMLConnectionRequestBuilder(SDKMethodInterfaces.MethodCallCreateSA
         this.sdk = sdk;
     }
                 
-    public CreateSAMLConnectionRequestBuilder request(CreateSAMLConnectionRequestBody request) {
+    public CreateSAMLConnectionRequestBuilder request(com.clerk.backend_api.models.operations.CreateSAMLConnectionRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public CreateSAMLConnectionRequestBuilder request(Optional<? extends CreateSAMLConnectionRequestBody> request) {
+    public CreateSAMLConnectionRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.CreateSAMLConnectionRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateSAMLConnectionResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateSAMLConnectionResponse.java
index bd79865..345139a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateSAMLConnectionResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateSAMLConnectionResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.SAMLConnection;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateSAMLConnectionResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateSAMLConnectionResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateSAMLConnectionResponse implements com.clerk.backend_api.utils
     /**
      * A SAML Connection
      */
-    private Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection;
+    private Optional<? extends SAMLConnection> samlConnection;
 
     @JsonCreator
     public CreateSAMLConnectionResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection) {
+            Optional<? extends SAMLConnection> samlConnection) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.SAMLConnection> samlConnection() {
-        return (Optional<com.clerk.backend_api.models.components.SAMLConnection>) samlConnection;
+    public Optional<SAMLConnection> samlConnection() {
+        return (Optional<SAMLConnection>) samlConnection;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateSAMLConnectionResponse withRawResponse(HttpResponse<InputStream> ra
     /**
      * A SAML Connection
      */
-    public CreateSAMLConnectionResponse withSAMLConnection(com.clerk.backend_api.models.components.SAMLConnection samlConnection) {
+    public CreateSAMLConnectionResponse withSAMLConnection(SAMLConnection samlConnection) {
         Utils.checkNotNull(samlConnection, "samlConnection");
         this.samlConnection = Optional.ofNullable(samlConnection);
         return this;
@@ -137,7 +141,7 @@ public CreateSAMLConnectionResponse withSAMLConnection(com.clerk.backend_api.mod
     /**
      * A SAML Connection
      */
-    public CreateSAMLConnectionResponse withSAMLConnection(Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection) {
+    public CreateSAMLConnectionResponse withSAMLConnection(Optional<? extends SAMLConnection> samlConnection) {
         Utils.checkNotNull(samlConnection, "samlConnection");
         this.samlConnection = samlConnection;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateSAMLConnectionResponse other = (CreateSAMLConnectionResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.samlConnection, other.samlConnection);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.samlConnection, other.samlConnection);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection = Optional.empty();  
+        private Optional<? extends SAMLConnection> samlConnection = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A SAML Connection
          */
-        public Builder samlConnection(com.clerk.backend_api.models.components.SAMLConnection samlConnection) {
+        public Builder samlConnection(SAMLConnection samlConnection) {
             Utils.checkNotNull(samlConnection, "samlConnection");
             this.samlConnection = Optional.ofNullable(samlConnection);
             return this;
@@ -230,7 +234,7 @@ public Builder samlConnection(com.clerk.backend_api.models.components.SAMLConnec
         /**
          * A SAML Connection
          */
-        public Builder samlConnection(Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection) {
+        public Builder samlConnection(Optional<? extends SAMLConnection> samlConnection) {
             Utils.checkNotNull(samlConnection, "samlConnection");
             this.samlConnection = samlConnection;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateRequest.java b/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateRequest.java
index 8d6bc0c..7967e82 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class CreateSessionTokenFromTemplateRequest {
 
@@ -87,13 +86,13 @@ public boolean equals(java.lang.Object o) {
         }
         CreateSessionTokenFromTemplateRequest other = (CreateSessionTokenFromTemplateRequest) o;
         return 
-            java.util.Objects.deepEquals(this.sessionId, other.sessionId) &&
-            java.util.Objects.deepEquals(this.templateName, other.templateName);
+            Objects.deepEquals(this.sessionId, other.sessionId) &&
+            Objects.deepEquals(this.templateName, other.templateName);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             sessionId,
             templateName);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateRequestBuilder.java
index 3768930..76c137e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class CreateSessionTokenFromTemplateRequestBuilder {
 
@@ -27,13 +17,13 @@ public CreateSessionTokenFromTemplateRequestBuilder(SDKMethodInterfaces.MethodCa
         this.sdk = sdk;
     }
 
-    public CreateSessionTokenFromTemplateRequestBuilder sessionId(String sessionId) {
+    public CreateSessionTokenFromTemplateRequestBuilder sessionId(java.lang.String sessionId) {
         Utils.checkNotNull(sessionId, "sessionId");
         this.sessionId = sessionId;
         return this;
     }
 
-    public CreateSessionTokenFromTemplateRequestBuilder templateName(String templateName) {
+    public CreateSessionTokenFromTemplateRequestBuilder templateName(java.lang.String templateName) {
         Utils.checkNotNull(templateName, "templateName");
         this.templateName = templateName;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateResponse.java
index 172c6b8..e3f1bdd 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateResponse.java
@@ -4,19 +4,22 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateSessionTokenFromTemplateResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateSessionTokenFromTemplateResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -153,15 +156,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateSessionTokenFromTemplateResponse other = (CreateSessionTokenFromTemplateResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.object, other.object);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.object, other.object);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateResponseBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateResponseBody.java
index a94bfdc..075a230 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateResponseBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateSessionTokenFromTemplateResponseBody.java
@@ -4,19 +4,19 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
+
 /**
  * CreateSessionTokenFromTemplateResponseBody - OK
  */
@@ -29,12 +29,12 @@ public class CreateSessionTokenFromTemplateResponseBody {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("jwt")
-    private Optional<? extends String> jwt;
+    private Optional<String> jwt;
 
     @JsonCreator
     public CreateSessionTokenFromTemplateResponseBody(
             @JsonProperty("object") Optional<? extends Object> object,
-            @JsonProperty("jwt") Optional<? extends String> jwt) {
+            @JsonProperty("jwt") Optional<String> jwt) {
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(jwt, "jwt");
         this.object = object;
@@ -51,10 +51,9 @@ public Optional<Object> object() {
         return (Optional<Object>) object;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> jwt() {
-        return (Optional<String>) jwt;
+        return jwt;
     }
 
     public final static Builder builder() {
@@ -79,7 +78,7 @@ public CreateSessionTokenFromTemplateResponseBody withJwt(String jwt) {
         return this;
     }
 
-    public CreateSessionTokenFromTemplateResponseBody withJwt(Optional<? extends String> jwt) {
+    public CreateSessionTokenFromTemplateResponseBody withJwt(Optional<String> jwt) {
         Utils.checkNotNull(jwt, "jwt");
         this.jwt = jwt;
         return this;
@@ -95,13 +94,13 @@ public boolean equals(java.lang.Object o) {
         }
         CreateSessionTokenFromTemplateResponseBody other = (CreateSessionTokenFromTemplateResponseBody) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.jwt, other.jwt);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.jwt, other.jwt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             jwt);
     }
@@ -117,7 +116,7 @@ public final static class Builder {
  
         private Optional<? extends Object> object = Optional.empty();
  
-        private Optional<? extends String> jwt = Optional.empty();  
+        private Optional<String> jwt = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -141,7 +140,7 @@ public Builder jwt(String jwt) {
             return this;
         }
 
-        public Builder jwt(Optional<? extends String> jwt) {
+        public Builder jwt(Optional<String> jwt) {
             Utils.checkNotNull(jwt, "jwt");
             this.jwt = jwt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateSignInTokenRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateSignInTokenRequestBody.java
index 7c5217c..247c0a6 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateSignInTokenRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateSignInTokenRequestBody.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class CreateSignInTokenRequestBody {
 
     /**
@@ -26,7 +27,7 @@ public class CreateSignInTokenRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("user_id")
-    private Optional<? extends String> userId;
+    private Optional<String> userId;
 
     /**
      * Optional parameter to specify the life duration of the sign in token in seconds.
@@ -34,12 +35,12 @@ public class CreateSignInTokenRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("expires_in_seconds")
-    private Optional<? extends Long> expiresInSeconds;
+    private Optional<Long> expiresInSeconds;
 
     @JsonCreator
     public CreateSignInTokenRequestBody(
-            @JsonProperty("user_id") Optional<? extends String> userId,
-            @JsonProperty("expires_in_seconds") Optional<? extends Long> expiresInSeconds) {
+            @JsonProperty("user_id") Optional<String> userId,
+            @JsonProperty("expires_in_seconds") Optional<Long> expiresInSeconds) {
         Utils.checkNotNull(userId, "userId");
         Utils.checkNotNull(expiresInSeconds, "expiresInSeconds");
         this.userId = userId;
@@ -53,20 +54,18 @@ public CreateSignInTokenRequestBody() {
     /**
      * The ID of the user that can use the newly created sign in token
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> userId() {
-        return (Optional<String>) userId;
+        return userId;
     }
 
     /**
      * Optional parameter to specify the life duration of the sign in token in seconds.
      * By default, the duration is 30 days.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> expiresInSeconds() {
-        return (Optional<Long>) expiresInSeconds;
+        return expiresInSeconds;
     }
 
     public final static Builder builder() {
@@ -85,7 +84,7 @@ public CreateSignInTokenRequestBody withUserId(String userId) {
     /**
      * The ID of the user that can use the newly created sign in token
      */
-    public CreateSignInTokenRequestBody withUserId(Optional<? extends String> userId) {
+    public CreateSignInTokenRequestBody withUserId(Optional<String> userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
@@ -105,7 +104,7 @@ public CreateSignInTokenRequestBody withExpiresInSeconds(long expiresInSeconds)
      * Optional parameter to specify the life duration of the sign in token in seconds.
      * By default, the duration is 30 days.
      */
-    public CreateSignInTokenRequestBody withExpiresInSeconds(Optional<? extends Long> expiresInSeconds) {
+    public CreateSignInTokenRequestBody withExpiresInSeconds(Optional<Long> expiresInSeconds) {
         Utils.checkNotNull(expiresInSeconds, "expiresInSeconds");
         this.expiresInSeconds = expiresInSeconds;
         return this;
@@ -121,13 +120,13 @@ public boolean equals(java.lang.Object o) {
         }
         CreateSignInTokenRequestBody other = (CreateSignInTokenRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.expiresInSeconds, other.expiresInSeconds);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.expiresInSeconds, other.expiresInSeconds);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             expiresInSeconds);
     }
@@ -141,9 +140,9 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> userId = Optional.empty();
+        private Optional<String> userId = Optional.empty();
  
-        private Optional<? extends Long> expiresInSeconds;  
+        private Optional<Long> expiresInSeconds;  
         
         private Builder() {
           // force use of static builder() method
@@ -161,7 +160,7 @@ public Builder userId(String userId) {
         /**
          * The ID of the user that can use the newly created sign in token
          */
-        public Builder userId(Optional<? extends String> userId) {
+        public Builder userId(Optional<String> userId) {
             Utils.checkNotNull(userId, "userId");
             this.userId = userId;
             return this;
@@ -181,7 +180,7 @@ public Builder expiresInSeconds(long expiresInSeconds) {
          * Optional parameter to specify the life duration of the sign in token in seconds.
          * By default, the duration is 30 days.
          */
-        public Builder expiresInSeconds(Optional<? extends Long> expiresInSeconds) {
+        public Builder expiresInSeconds(Optional<Long> expiresInSeconds) {
             Utils.checkNotNull(expiresInSeconds, "expiresInSeconds");
             this.expiresInSeconds = expiresInSeconds;
             return this;
@@ -196,11 +195,11 @@ public CreateSignInTokenRequestBody build() {
                 expiresInSeconds);
         }
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_ExpiresInSeconds =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_ExpiresInSeconds =
                 new LazySingletonValue<>(
                         "expires_in_seconds",
                         "2592000",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateSignInTokenRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateSignInTokenRequestBuilder.java
index 2382284..87169a4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateSignInTokenRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateSignInTokenRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreateSignInTokenRequestBuilder {
 
@@ -26,13 +16,13 @@ public CreateSignInTokenRequestBuilder(SDKMethodInterfaces.MethodCallCreateSignI
         this.sdk = sdk;
     }
                 
-    public CreateSignInTokenRequestBuilder request(CreateSignInTokenRequestBody request) {
+    public CreateSignInTokenRequestBuilder request(com.clerk.backend_api.models.operations.CreateSignInTokenRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public CreateSignInTokenRequestBuilder request(Optional<? extends CreateSignInTokenRequestBody> request) {
+    public CreateSignInTokenRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.CreateSignInTokenRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateSignInTokenResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateSignInTokenResponse.java
index c805312..d3080ef 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateSignInTokenResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateSignInTokenResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.SignInToken;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateSignInTokenResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateSignInTokenResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateSignInTokenResponse implements com.clerk.backend_api.utils.Re
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.SignInToken> signInToken;
+    private Optional<? extends SignInToken> signInToken;
 
     @JsonCreator
     public CreateSignInTokenResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.SignInToken> signInToken) {
+            Optional<? extends SignInToken> signInToken) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.SignInToken> signInToken() {
-        return (Optional<com.clerk.backend_api.models.components.SignInToken>) signInToken;
+    public Optional<SignInToken> signInToken() {
+        return (Optional<SignInToken>) signInToken;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateSignInTokenResponse withRawResponse(HttpResponse<InputStream> rawRe
     /**
      * Success
      */
-    public CreateSignInTokenResponse withSignInToken(com.clerk.backend_api.models.components.SignInToken signInToken) {
+    public CreateSignInTokenResponse withSignInToken(SignInToken signInToken) {
         Utils.checkNotNull(signInToken, "signInToken");
         this.signInToken = Optional.ofNullable(signInToken);
         return this;
@@ -137,7 +141,7 @@ public CreateSignInTokenResponse withSignInToken(com.clerk.backend_api.models.co
     /**
      * Success
      */
-    public CreateSignInTokenResponse withSignInToken(Optional<? extends com.clerk.backend_api.models.components.SignInToken> signInToken) {
+    public CreateSignInTokenResponse withSignInToken(Optional<? extends SignInToken> signInToken) {
         Utils.checkNotNull(signInToken, "signInToken");
         this.signInToken = signInToken;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateSignInTokenResponse other = (CreateSignInTokenResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.signInToken, other.signInToken);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.signInToken, other.signInToken);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.SignInToken> signInToken = Optional.empty();  
+        private Optional<? extends SignInToken> signInToken = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder signInToken(com.clerk.backend_api.models.components.SignInToken signInToken) {
+        public Builder signInToken(SignInToken signInToken) {
             Utils.checkNotNull(signInToken, "signInToken");
             this.signInToken = Optional.ofNullable(signInToken);
             return this;
@@ -230,7 +234,7 @@ public Builder signInToken(com.clerk.backend_api.models.components.SignInToken s
         /**
          * Success
          */
-        public Builder signInToken(Optional<? extends com.clerk.backend_api.models.components.SignInToken> signInToken) {
+        public Builder signInToken(Optional<? extends SignInToken> signInToken) {
             Utils.checkNotNull(signInToken, "signInToken");
             this.signInToken = signInToken;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateSvixAppRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateSvixAppRequestBuilder.java
index 1e1ff7c..470e3c7 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateSvixAppRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateSvixAppRequestBuilder.java
@@ -4,18 +4,6 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreateSvixAppRequestBuilder {
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateSvixAppResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateSvixAppResponse.java
index cbb88ed..060a089 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateSvixAppResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateSvixAppResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.SvixURL;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateSvixAppResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateSvixAppResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateSvixAppResponse implements com.clerk.backend_api.utils.Respon
     /**
      * Response that contains a temporary Svix URL to access management dashboard
      */
-    private Optional<? extends com.clerk.backend_api.models.components.SvixURL> svixURL;
+    private Optional<? extends SvixURL> svixURL;
 
     @JsonCreator
     public CreateSvixAppResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.SvixURL> svixURL) {
+            Optional<? extends SvixURL> svixURL) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.SvixURL> svixURL() {
-        return (Optional<com.clerk.backend_api.models.components.SvixURL>) svixURL;
+    public Optional<SvixURL> svixURL() {
+        return (Optional<SvixURL>) svixURL;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateSvixAppResponse withRawResponse(HttpResponse<InputStream> rawRespon
     /**
      * Response that contains a temporary Svix URL to access management dashboard
      */
-    public CreateSvixAppResponse withSvixURL(com.clerk.backend_api.models.components.SvixURL svixURL) {
+    public CreateSvixAppResponse withSvixURL(SvixURL svixURL) {
         Utils.checkNotNull(svixURL, "svixURL");
         this.svixURL = Optional.ofNullable(svixURL);
         return this;
@@ -137,7 +141,7 @@ public CreateSvixAppResponse withSvixURL(com.clerk.backend_api.models.components
     /**
      * Response that contains a temporary Svix URL to access management dashboard
      */
-    public CreateSvixAppResponse withSvixURL(Optional<? extends com.clerk.backend_api.models.components.SvixURL> svixURL) {
+    public CreateSvixAppResponse withSvixURL(Optional<? extends SvixURL> svixURL) {
         Utils.checkNotNull(svixURL, "svixURL");
         this.svixURL = svixURL;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateSvixAppResponse other = (CreateSvixAppResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.svixURL, other.svixURL);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.svixURL, other.svixURL);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.SvixURL> svixURL = Optional.empty();  
+        private Optional<? extends SvixURL> svixURL = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Response that contains a temporary Svix URL to access management dashboard
          */
-        public Builder svixURL(com.clerk.backend_api.models.components.SvixURL svixURL) {
+        public Builder svixURL(SvixURL svixURL) {
             Utils.checkNotNull(svixURL, "svixURL");
             this.svixURL = Optional.ofNullable(svixURL);
             return this;
@@ -230,7 +234,7 @@ public Builder svixURL(com.clerk.backend_api.models.components.SvixURL svixURL)
         /**
          * Response that contains a temporary Svix URL to access management dashboard
          */
-        public Builder svixURL(Optional<? extends com.clerk.backend_api.models.components.SvixURL> svixURL) {
+        public Builder svixURL(Optional<? extends SvixURL> svixURL) {
             Utils.checkNotNull(svixURL, "svixURL");
             this.svixURL = svixURL;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateTestingTokenRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateTestingTokenRequestBuilder.java
index 463786f..9734186 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateTestingTokenRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateTestingTokenRequestBuilder.java
@@ -4,18 +4,6 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreateTestingTokenRequestBuilder {
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateTestingTokenResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateTestingTokenResponse.java
index 2c56168..bd611af 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateTestingTokenResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateTestingTokenResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.TestingToken;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateTestingTokenResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateTestingTokenResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateTestingTokenResponse implements com.clerk.backend_api.utils.R
     /**
      * A Testing Token
      */
-    private Optional<? extends com.clerk.backend_api.models.components.TestingToken> testingToken;
+    private Optional<? extends TestingToken> testingToken;
 
     @JsonCreator
     public CreateTestingTokenResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.TestingToken> testingToken) {
+            Optional<? extends TestingToken> testingToken) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.TestingToken> testingToken() {
-        return (Optional<com.clerk.backend_api.models.components.TestingToken>) testingToken;
+    public Optional<TestingToken> testingToken() {
+        return (Optional<TestingToken>) testingToken;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateTestingTokenResponse withRawResponse(HttpResponse<InputStream> rawR
     /**
      * A Testing Token
      */
-    public CreateTestingTokenResponse withTestingToken(com.clerk.backend_api.models.components.TestingToken testingToken) {
+    public CreateTestingTokenResponse withTestingToken(TestingToken testingToken) {
         Utils.checkNotNull(testingToken, "testingToken");
         this.testingToken = Optional.ofNullable(testingToken);
         return this;
@@ -137,7 +141,7 @@ public CreateTestingTokenResponse withTestingToken(com.clerk.backend_api.models.
     /**
      * A Testing Token
      */
-    public CreateTestingTokenResponse withTestingToken(Optional<? extends com.clerk.backend_api.models.components.TestingToken> testingToken) {
+    public CreateTestingTokenResponse withTestingToken(Optional<? extends TestingToken> testingToken) {
         Utils.checkNotNull(testingToken, "testingToken");
         this.testingToken = testingToken;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateTestingTokenResponse other = (CreateTestingTokenResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.testingToken, other.testingToken);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.testingToken, other.testingToken);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.TestingToken> testingToken = Optional.empty();  
+        private Optional<? extends TestingToken> testingToken = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A Testing Token
          */
-        public Builder testingToken(com.clerk.backend_api.models.components.TestingToken testingToken) {
+        public Builder testingToken(TestingToken testingToken) {
             Utils.checkNotNull(testingToken, "testingToken");
             this.testingToken = Optional.ofNullable(testingToken);
             return this;
@@ -230,7 +234,7 @@ public Builder testingToken(com.clerk.backend_api.models.components.TestingToken
         /**
          * A Testing Token
          */
-        public Builder testingToken(Optional<? extends com.clerk.backend_api.models.components.TestingToken> testingToken) {
+        public Builder testingToken(Optional<? extends TestingToken> testingToken) {
             Utils.checkNotNull(testingToken, "testingToken");
             this.testingToken = testingToken;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateUserRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/CreateUserRequestBody.java
index b09fe79..32740a1 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateUserRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateUserRequestBody.java
@@ -4,21 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class CreateUserRequestBody {
 
     /**
@@ -27,21 +29,21 @@ public class CreateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("external_id")
-    private JsonNullable<? extends String> externalId;
+    private JsonNullable<String> externalId;
 
     /**
      * The first name to assign to the user
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("first_name")
-    private JsonNullable<? extends String> firstName;
+    private JsonNullable<String> firstName;
 
     /**
      * The last name to assign to the user
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("last_name")
-    private JsonNullable<? extends String> lastName;
+    private JsonNullable<String> lastName;
 
     /**
      * Email addresses to add to the user.
@@ -50,7 +52,7 @@ public class CreateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("email_address")
-    private Optional<? extends java.util.List<String>> emailAddress;
+    private Optional<? extends List<String>> emailAddress;
 
     /**
      * Phone numbers to add to the user.
@@ -59,7 +61,7 @@ public class CreateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("phone_number")
-    private Optional<? extends java.util.List<String>> phoneNumber;
+    private Optional<? extends List<String>> phoneNumber;
 
     /**
      * Web3 wallets to add to the user.
@@ -68,7 +70,7 @@ public class CreateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("web3_wallet")
-    private Optional<? extends java.util.List<String>> web3Wallet;
+    private Optional<? extends List<String>> web3Wallet;
 
     /**
      * The username to give to the user.
@@ -76,7 +78,7 @@ public class CreateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("username")
-    private JsonNullable<? extends String> username;
+    private JsonNullable<String> username;
 
     /**
      * The plaintext password to give the user.
@@ -84,7 +86,7 @@ public class CreateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("password")
-    private JsonNullable<? extends String> password;
+    private JsonNullable<String> password;
 
     /**
      * In case you already have the password digests and not the passwords, you can use them for the newly created user via this property.
@@ -93,7 +95,7 @@ public class CreateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("password_digest")
-    private Optional<? extends String> passwordDigest;
+    private Optional<String> passwordDigest;
 
     /**
      * The hashing algorithm that was used to generate the password digest.
@@ -231,7 +233,7 @@ public class CreateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("skip_password_checks")
-    private Optional<? extends Boolean> skipPasswordChecks;
+    private Optional<Boolean> skipPasswordChecks;
 
     /**
      * When set to `true`, `password` is not required anymore when creating the user and can be omitted.
@@ -240,7 +242,7 @@ public class CreateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("skip_password_requirement")
-    private Optional<? extends Boolean> skipPasswordRequirement;
+    private Optional<Boolean> skipPasswordRequirement;
 
     /**
      * In case TOTP is configured on the instance, you can provide the secret to enable it on the newly created user without the need to reset it.
@@ -251,7 +253,7 @@ public class CreateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("totp_secret")
-    private Optional<? extends String> totpSecret;
+    private Optional<String> totpSecret;
 
     /**
      * If Backup Codes are configured on the instance, you can provide them to enable it on the newly created user without the need to reset them.
@@ -259,7 +261,7 @@ public class CreateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("backup_codes")
-    private Optional<? extends java.util.List<String>> backupCodes;
+    private Optional<? extends List<String>> backupCodes;
 
     /**
      * Metadata saved on the user, that is visible to both your Frontend and Backend APIs
@@ -288,28 +290,28 @@ public class CreateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("created_at")
-    private Optional<? extends String> createdAt;
+    private Optional<String> createdAt;
 
     @JsonCreator
     public CreateUserRequestBody(
-            @JsonProperty("external_id") JsonNullable<? extends String> externalId,
-            @JsonProperty("first_name") JsonNullable<? extends String> firstName,
-            @JsonProperty("last_name") JsonNullable<? extends String> lastName,
-            @JsonProperty("email_address") Optional<? extends java.util.List<String>> emailAddress,
-            @JsonProperty("phone_number") Optional<? extends java.util.List<String>> phoneNumber,
-            @JsonProperty("web3_wallet") Optional<? extends java.util.List<String>> web3Wallet,
-            @JsonProperty("username") JsonNullable<? extends String> username,
-            @JsonProperty("password") JsonNullable<? extends String> password,
-            @JsonProperty("password_digest") Optional<? extends String> passwordDigest,
+            @JsonProperty("external_id") JsonNullable<String> externalId,
+            @JsonProperty("first_name") JsonNullable<String> firstName,
+            @JsonProperty("last_name") JsonNullable<String> lastName,
+            @JsonProperty("email_address") Optional<? extends List<String>> emailAddress,
+            @JsonProperty("phone_number") Optional<? extends List<String>> phoneNumber,
+            @JsonProperty("web3_wallet") Optional<? extends List<String>> web3Wallet,
+            @JsonProperty("username") JsonNullable<String> username,
+            @JsonProperty("password") JsonNullable<String> password,
+            @JsonProperty("password_digest") Optional<String> passwordDigest,
             @JsonProperty("password_hasher") Optional<? extends PasswordHasher> passwordHasher,
-            @JsonProperty("skip_password_checks") Optional<? extends Boolean> skipPasswordChecks,
-            @JsonProperty("skip_password_requirement") Optional<? extends Boolean> skipPasswordRequirement,
-            @JsonProperty("totp_secret") Optional<? extends String> totpSecret,
-            @JsonProperty("backup_codes") Optional<? extends java.util.List<String>> backupCodes,
+            @JsonProperty("skip_password_checks") Optional<Boolean> skipPasswordChecks,
+            @JsonProperty("skip_password_requirement") Optional<Boolean> skipPasswordRequirement,
+            @JsonProperty("totp_secret") Optional<String> totpSecret,
+            @JsonProperty("backup_codes") Optional<? extends List<String>> backupCodes,
             @JsonProperty("public_metadata") Optional<? extends PublicMetadata> publicMetadata,
             @JsonProperty("private_metadata") Optional<? extends PrivateMetadata> privateMetadata,
             @JsonProperty("unsafe_metadata") Optional<? extends UnsafeMetadata> unsafeMetadata,
-            @JsonProperty("created_at") Optional<? extends String> createdAt) {
+            @JsonProperty("created_at") Optional<String> createdAt) {
         Utils.checkNotNull(externalId, "externalId");
         Utils.checkNotNull(firstName, "firstName");
         Utils.checkNotNull(lastName, "lastName");
@@ -356,28 +358,25 @@ public CreateUserRequestBody() {
      * The ID of the user as used in your external systems or your previous authentication solution.
      * Must be unique across your instance.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> externalId() {
-        return (JsonNullable<String>) externalId;
+        return externalId;
     }
 
     /**
      * The first name to assign to the user
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> firstName() {
-        return (JsonNullable<String>) firstName;
+        return firstName;
     }
 
     /**
      * The last name to assign to the user
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> lastName() {
-        return (JsonNullable<String>) lastName;
+        return lastName;
     }
 
     /**
@@ -387,8 +386,8 @@ public JsonNullable<String> lastName() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> emailAddress() {
-        return (Optional<java.util.List<String>>) emailAddress;
+    public Optional<List<String>> emailAddress() {
+        return (Optional<List<String>>) emailAddress;
     }
 
     /**
@@ -398,8 +397,8 @@ public Optional<java.util.List<String>> emailAddress() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> phoneNumber() {
-        return (Optional<java.util.List<String>>) phoneNumber;
+    public Optional<List<String>> phoneNumber() {
+        return (Optional<List<String>>) phoneNumber;
     }
 
     /**
@@ -409,28 +408,26 @@ public Optional<java.util.List<String>> phoneNumber() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> web3Wallet() {
-        return (Optional<java.util.List<String>>) web3Wallet;
+    public Optional<List<String>> web3Wallet() {
+        return (Optional<List<String>>) web3Wallet;
     }
 
     /**
      * The username to give to the user.
      * It must be unique across your instance.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> username() {
-        return (JsonNullable<String>) username;
+        return username;
     }
 
     /**
      * The plaintext password to give the user.
      * Must be at least 8 characters long, and can not be in any list of hacked passwords.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> password() {
-        return (JsonNullable<String>) password;
+        return password;
     }
 
     /**
@@ -438,10 +435,9 @@ public JsonNullable<String> password() {
      * The digests should be generated with one of the supported algorithms.
      * The hashing algorithm can be specified using the `password_hasher` property.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> passwordDigest() {
-        return (Optional<String>) passwordDigest;
+        return passwordDigest;
     }
 
     /**
@@ -580,10 +576,9 @@ public Optional<PasswordHasher> passwordHasher() {
      * It is recommended to use this method only when migrating plaintext passwords to Clerk.
      * Upon migration the user base should be prompted to pick stronger password.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> skipPasswordChecks() {
-        return (Optional<Boolean>) skipPasswordChecks;
+        return skipPasswordChecks;
     }
 
     /**
@@ -591,10 +586,9 @@ public Optional<Boolean> skipPasswordChecks() {
      * This is useful when you are trying to create a user that doesn't have a password, in an instance that is using passwords.
      * Please note that you cannot use this flag if password is the only way for a user to sign into your instance.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> skipPasswordRequirement() {
-        return (Optional<Boolean>) skipPasswordRequirement;
+        return skipPasswordRequirement;
     }
 
     /**
@@ -604,10 +598,9 @@ public Optional<Boolean> skipPasswordRequirement() {
      * * Code length: 6 digits
      * * Algorithm: SHA1
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> totpSecret() {
-        return (Optional<String>) totpSecret;
+        return totpSecret;
     }
 
     /**
@@ -616,8 +609,8 @@ public Optional<String> totpSecret() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> backupCodes() {
-        return (Optional<java.util.List<String>>) backupCodes;
+    public Optional<List<String>> backupCodes() {
+        return (Optional<List<String>>) backupCodes;
     }
 
     /**
@@ -651,10 +644,9 @@ public Optional<UnsafeMetadata> unsafeMetadata() {
     /**
      * A custom date/time denoting _when_ the user signed up to the application, specified in RFC3339 format (e.g. `2012-10-20T07:15:20.902Z`).
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> createdAt() {
-        return (Optional<String>) createdAt;
+        return createdAt;
     }
 
     public final static Builder builder() {
@@ -675,7 +667,7 @@ public CreateUserRequestBody withExternalId(String externalId) {
      * The ID of the user as used in your external systems or your previous authentication solution.
      * Must be unique across your instance.
      */
-    public CreateUserRequestBody withExternalId(JsonNullable<? extends String> externalId) {
+    public CreateUserRequestBody withExternalId(JsonNullable<String> externalId) {
         Utils.checkNotNull(externalId, "externalId");
         this.externalId = externalId;
         return this;
@@ -693,7 +685,7 @@ public CreateUserRequestBody withFirstName(String firstName) {
     /**
      * The first name to assign to the user
      */
-    public CreateUserRequestBody withFirstName(JsonNullable<? extends String> firstName) {
+    public CreateUserRequestBody withFirstName(JsonNullable<String> firstName) {
         Utils.checkNotNull(firstName, "firstName");
         this.firstName = firstName;
         return this;
@@ -711,7 +703,7 @@ public CreateUserRequestBody withLastName(String lastName) {
     /**
      * The last name to assign to the user
      */
-    public CreateUserRequestBody withLastName(JsonNullable<? extends String> lastName) {
+    public CreateUserRequestBody withLastName(JsonNullable<String> lastName) {
         Utils.checkNotNull(lastName, "lastName");
         this.lastName = lastName;
         return this;
@@ -722,7 +714,7 @@ public CreateUserRequestBody withLastName(JsonNullable<? extends String> lastNam
      * Must be unique across your instance.
      * The first email address will be set as the user's primary email address.
      */
-    public CreateUserRequestBody withEmailAddress(java.util.List<String> emailAddress) {
+    public CreateUserRequestBody withEmailAddress(List<String> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = Optional.ofNullable(emailAddress);
         return this;
@@ -733,7 +725,7 @@ public CreateUserRequestBody withEmailAddress(java.util.List<String> emailAddres
      * Must be unique across your instance.
      * The first email address will be set as the user's primary email address.
      */
-    public CreateUserRequestBody withEmailAddress(Optional<? extends java.util.List<String>> emailAddress) {
+    public CreateUserRequestBody withEmailAddress(Optional<? extends List<String>> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = emailAddress;
         return this;
@@ -744,7 +736,7 @@ public CreateUserRequestBody withEmailAddress(Optional<? extends java.util.List<
      * Must be unique across your instance.
      * The first phone number will be set as the user's primary phone number.
      */
-    public CreateUserRequestBody withPhoneNumber(java.util.List<String> phoneNumber) {
+    public CreateUserRequestBody withPhoneNumber(List<String> phoneNumber) {
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         this.phoneNumber = Optional.ofNullable(phoneNumber);
         return this;
@@ -755,7 +747,7 @@ public CreateUserRequestBody withPhoneNumber(java.util.List<String> phoneNumber)
      * Must be unique across your instance.
      * The first phone number will be set as the user's primary phone number.
      */
-    public CreateUserRequestBody withPhoneNumber(Optional<? extends java.util.List<String>> phoneNumber) {
+    public CreateUserRequestBody withPhoneNumber(Optional<? extends List<String>> phoneNumber) {
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         this.phoneNumber = phoneNumber;
         return this;
@@ -766,7 +758,7 @@ public CreateUserRequestBody withPhoneNumber(Optional<? extends java.util.List<S
      * Must be unique across your instance.
      * The first wallet will be set as the user's primary wallet.
      */
-    public CreateUserRequestBody withWeb3Wallet(java.util.List<String> web3Wallet) {
+    public CreateUserRequestBody withWeb3Wallet(List<String> web3Wallet) {
         Utils.checkNotNull(web3Wallet, "web3Wallet");
         this.web3Wallet = Optional.ofNullable(web3Wallet);
         return this;
@@ -777,7 +769,7 @@ public CreateUserRequestBody withWeb3Wallet(java.util.List<String> web3Wallet) {
      * Must be unique across your instance.
      * The first wallet will be set as the user's primary wallet.
      */
-    public CreateUserRequestBody withWeb3Wallet(Optional<? extends java.util.List<String>> web3Wallet) {
+    public CreateUserRequestBody withWeb3Wallet(Optional<? extends List<String>> web3Wallet) {
         Utils.checkNotNull(web3Wallet, "web3Wallet");
         this.web3Wallet = web3Wallet;
         return this;
@@ -797,7 +789,7 @@ public CreateUserRequestBody withUsername(String username) {
      * The username to give to the user.
      * It must be unique across your instance.
      */
-    public CreateUserRequestBody withUsername(JsonNullable<? extends String> username) {
+    public CreateUserRequestBody withUsername(JsonNullable<String> username) {
         Utils.checkNotNull(username, "username");
         this.username = username;
         return this;
@@ -817,7 +809,7 @@ public CreateUserRequestBody withPassword(String password) {
      * The plaintext password to give the user.
      * Must be at least 8 characters long, and can not be in any list of hacked passwords.
      */
-    public CreateUserRequestBody withPassword(JsonNullable<? extends String> password) {
+    public CreateUserRequestBody withPassword(JsonNullable<String> password) {
         Utils.checkNotNull(password, "password");
         this.password = password;
         return this;
@@ -839,7 +831,7 @@ public CreateUserRequestBody withPasswordDigest(String passwordDigest) {
      * The digests should be generated with one of the supported algorithms.
      * The hashing algorithm can be specified using the `password_hasher` property.
      */
-    public CreateUserRequestBody withPasswordDigest(Optional<? extends String> passwordDigest) {
+    public CreateUserRequestBody withPasswordDigest(Optional<String> passwordDigest) {
         Utils.checkNotNull(passwordDigest, "passwordDigest");
         this.passwordDigest = passwordDigest;
         return this;
@@ -1123,7 +1115,7 @@ public CreateUserRequestBody withSkipPasswordChecks(boolean skipPasswordChecks)
      * It is recommended to use this method only when migrating plaintext passwords to Clerk.
      * Upon migration the user base should be prompted to pick stronger password.
      */
-    public CreateUserRequestBody withSkipPasswordChecks(Optional<? extends Boolean> skipPasswordChecks) {
+    public CreateUserRequestBody withSkipPasswordChecks(Optional<Boolean> skipPasswordChecks) {
         Utils.checkNotNull(skipPasswordChecks, "skipPasswordChecks");
         this.skipPasswordChecks = skipPasswordChecks;
         return this;
@@ -1145,7 +1137,7 @@ public CreateUserRequestBody withSkipPasswordRequirement(boolean skipPasswordReq
      * This is useful when you are trying to create a user that doesn't have a password, in an instance that is using passwords.
      * Please note that you cannot use this flag if password is the only way for a user to sign into your instance.
      */
-    public CreateUserRequestBody withSkipPasswordRequirement(Optional<? extends Boolean> skipPasswordRequirement) {
+    public CreateUserRequestBody withSkipPasswordRequirement(Optional<Boolean> skipPasswordRequirement) {
         Utils.checkNotNull(skipPasswordRequirement, "skipPasswordRequirement");
         this.skipPasswordRequirement = skipPasswordRequirement;
         return this;
@@ -1171,7 +1163,7 @@ public CreateUserRequestBody withTotpSecret(String totpSecret) {
      * * Code length: 6 digits
      * * Algorithm: SHA1
      */
-    public CreateUserRequestBody withTotpSecret(Optional<? extends String> totpSecret) {
+    public CreateUserRequestBody withTotpSecret(Optional<String> totpSecret) {
         Utils.checkNotNull(totpSecret, "totpSecret");
         this.totpSecret = totpSecret;
         return this;
@@ -1181,7 +1173,7 @@ public CreateUserRequestBody withTotpSecret(Optional<? extends String> totpSecre
      * If Backup Codes are configured on the instance, you can provide them to enable it on the newly created user without the need to reset them.
      * You must provide the backup codes in plain format or the corresponding bcrypt digest.
      */
-    public CreateUserRequestBody withBackupCodes(java.util.List<String> backupCodes) {
+    public CreateUserRequestBody withBackupCodes(List<String> backupCodes) {
         Utils.checkNotNull(backupCodes, "backupCodes");
         this.backupCodes = Optional.ofNullable(backupCodes);
         return this;
@@ -1191,7 +1183,7 @@ public CreateUserRequestBody withBackupCodes(java.util.List<String> backupCodes)
      * If Backup Codes are configured on the instance, you can provide them to enable it on the newly created user without the need to reset them.
      * You must provide the backup codes in plain format or the corresponding bcrypt digest.
      */
-    public CreateUserRequestBody withBackupCodes(Optional<? extends java.util.List<String>> backupCodes) {
+    public CreateUserRequestBody withBackupCodes(Optional<? extends List<String>> backupCodes) {
         Utils.checkNotNull(backupCodes, "backupCodes");
         this.backupCodes = backupCodes;
         return this;
@@ -1265,7 +1257,7 @@ public CreateUserRequestBody withCreatedAt(String createdAt) {
     /**
      * A custom date/time denoting _when_ the user signed up to the application, specified in RFC3339 format (e.g. `2012-10-20T07:15:20.902Z`).
      */
-    public CreateUserRequestBody withCreatedAt(Optional<? extends String> createdAt) {
+    public CreateUserRequestBody withCreatedAt(Optional<String> createdAt) {
         Utils.checkNotNull(createdAt, "createdAt");
         this.createdAt = createdAt;
         return this;
@@ -1281,29 +1273,29 @@ public boolean equals(java.lang.Object o) {
         }
         CreateUserRequestBody other = (CreateUserRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.externalId, other.externalId) &&
-            java.util.Objects.deepEquals(this.firstName, other.firstName) &&
-            java.util.Objects.deepEquals(this.lastName, other.lastName) &&
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.phoneNumber, other.phoneNumber) &&
-            java.util.Objects.deepEquals(this.web3Wallet, other.web3Wallet) &&
-            java.util.Objects.deepEquals(this.username, other.username) &&
-            java.util.Objects.deepEquals(this.password, other.password) &&
-            java.util.Objects.deepEquals(this.passwordDigest, other.passwordDigest) &&
-            java.util.Objects.deepEquals(this.passwordHasher, other.passwordHasher) &&
-            java.util.Objects.deepEquals(this.skipPasswordChecks, other.skipPasswordChecks) &&
-            java.util.Objects.deepEquals(this.skipPasswordRequirement, other.skipPasswordRequirement) &&
-            java.util.Objects.deepEquals(this.totpSecret, other.totpSecret) &&
-            java.util.Objects.deepEquals(this.backupCodes, other.backupCodes) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
-            java.util.Objects.deepEquals(this.unsafeMetadata, other.unsafeMetadata) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt);
+            Objects.deepEquals(this.externalId, other.externalId) &&
+            Objects.deepEquals(this.firstName, other.firstName) &&
+            Objects.deepEquals(this.lastName, other.lastName) &&
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.phoneNumber, other.phoneNumber) &&
+            Objects.deepEquals(this.web3Wallet, other.web3Wallet) &&
+            Objects.deepEquals(this.username, other.username) &&
+            Objects.deepEquals(this.password, other.password) &&
+            Objects.deepEquals(this.passwordDigest, other.passwordDigest) &&
+            Objects.deepEquals(this.passwordHasher, other.passwordHasher) &&
+            Objects.deepEquals(this.skipPasswordChecks, other.skipPasswordChecks) &&
+            Objects.deepEquals(this.skipPasswordRequirement, other.skipPasswordRequirement) &&
+            Objects.deepEquals(this.totpSecret, other.totpSecret) &&
+            Objects.deepEquals(this.backupCodes, other.backupCodes) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
+            Objects.deepEquals(this.unsafeMetadata, other.unsafeMetadata) &&
+            Objects.deepEquals(this.createdAt, other.createdAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             externalId,
             firstName,
             lastName,
@@ -1349,33 +1341,33 @@ public String toString() {
     
     public final static class Builder {
  
-        private JsonNullable<? extends String> externalId = JsonNullable.undefined();
+        private JsonNullable<String> externalId = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> firstName = JsonNullable.undefined();
+        private JsonNullable<String> firstName = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> lastName = JsonNullable.undefined();
+        private JsonNullable<String> lastName = JsonNullable.undefined();
  
-        private Optional<? extends java.util.List<String>> emailAddress = Optional.empty();
+        private Optional<? extends List<String>> emailAddress = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> phoneNumber = Optional.empty();
+        private Optional<? extends List<String>> phoneNumber = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> web3Wallet = Optional.empty();
+        private Optional<? extends List<String>> web3Wallet = Optional.empty();
  
-        private JsonNullable<? extends String> username = JsonNullable.undefined();
+        private JsonNullable<String> username = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> password = JsonNullable.undefined();
+        private JsonNullable<String> password = JsonNullable.undefined();
  
-        private Optional<? extends String> passwordDigest = Optional.empty();
+        private Optional<String> passwordDigest = Optional.empty();
  
         private Optional<? extends PasswordHasher> passwordHasher = Optional.empty();
  
-        private Optional<? extends Boolean> skipPasswordChecks = Optional.empty();
+        private Optional<Boolean> skipPasswordChecks = Optional.empty();
  
-        private Optional<? extends Boolean> skipPasswordRequirement = Optional.empty();
+        private Optional<Boolean> skipPasswordRequirement = Optional.empty();
  
-        private Optional<? extends String> totpSecret = Optional.empty();
+        private Optional<String> totpSecret = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> backupCodes = Optional.empty();
+        private Optional<? extends List<String>> backupCodes = Optional.empty();
  
         private Optional<? extends PublicMetadata> publicMetadata = Optional.empty();
  
@@ -1383,7 +1375,7 @@ public final static class Builder {
  
         private Optional<? extends UnsafeMetadata> unsafeMetadata = Optional.empty();
  
-        private Optional<? extends String> createdAt = Optional.empty();  
+        private Optional<String> createdAt = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -1403,7 +1395,7 @@ public Builder externalId(String externalId) {
          * The ID of the user as used in your external systems or your previous authentication solution.
          * Must be unique across your instance.
          */
-        public Builder externalId(JsonNullable<? extends String> externalId) {
+        public Builder externalId(JsonNullable<String> externalId) {
             Utils.checkNotNull(externalId, "externalId");
             this.externalId = externalId;
             return this;
@@ -1421,7 +1413,7 @@ public Builder firstName(String firstName) {
         /**
          * The first name to assign to the user
          */
-        public Builder firstName(JsonNullable<? extends String> firstName) {
+        public Builder firstName(JsonNullable<String> firstName) {
             Utils.checkNotNull(firstName, "firstName");
             this.firstName = firstName;
             return this;
@@ -1439,7 +1431,7 @@ public Builder lastName(String lastName) {
         /**
          * The last name to assign to the user
          */
-        public Builder lastName(JsonNullable<? extends String> lastName) {
+        public Builder lastName(JsonNullable<String> lastName) {
             Utils.checkNotNull(lastName, "lastName");
             this.lastName = lastName;
             return this;
@@ -1450,7 +1442,7 @@ public Builder lastName(JsonNullable<? extends String> lastName) {
          * Must be unique across your instance.
          * The first email address will be set as the user's primary email address.
          */
-        public Builder emailAddress(java.util.List<String> emailAddress) {
+        public Builder emailAddress(List<String> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = Optional.ofNullable(emailAddress);
             return this;
@@ -1461,7 +1453,7 @@ public Builder emailAddress(java.util.List<String> emailAddress) {
          * Must be unique across your instance.
          * The first email address will be set as the user's primary email address.
          */
-        public Builder emailAddress(Optional<? extends java.util.List<String>> emailAddress) {
+        public Builder emailAddress(Optional<? extends List<String>> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = emailAddress;
             return this;
@@ -1472,7 +1464,7 @@ public Builder emailAddress(Optional<? extends java.util.List<String>> emailAddr
          * Must be unique across your instance.
          * The first phone number will be set as the user's primary phone number.
          */
-        public Builder phoneNumber(java.util.List<String> phoneNumber) {
+        public Builder phoneNumber(List<String> phoneNumber) {
             Utils.checkNotNull(phoneNumber, "phoneNumber");
             this.phoneNumber = Optional.ofNullable(phoneNumber);
             return this;
@@ -1483,7 +1475,7 @@ public Builder phoneNumber(java.util.List<String> phoneNumber) {
          * Must be unique across your instance.
          * The first phone number will be set as the user's primary phone number.
          */
-        public Builder phoneNumber(Optional<? extends java.util.List<String>> phoneNumber) {
+        public Builder phoneNumber(Optional<? extends List<String>> phoneNumber) {
             Utils.checkNotNull(phoneNumber, "phoneNumber");
             this.phoneNumber = phoneNumber;
             return this;
@@ -1494,7 +1486,7 @@ public Builder phoneNumber(Optional<? extends java.util.List<String>> phoneNumbe
          * Must be unique across your instance.
          * The first wallet will be set as the user's primary wallet.
          */
-        public Builder web3Wallet(java.util.List<String> web3Wallet) {
+        public Builder web3Wallet(List<String> web3Wallet) {
             Utils.checkNotNull(web3Wallet, "web3Wallet");
             this.web3Wallet = Optional.ofNullable(web3Wallet);
             return this;
@@ -1505,7 +1497,7 @@ public Builder web3Wallet(java.util.List<String> web3Wallet) {
          * Must be unique across your instance.
          * The first wallet will be set as the user's primary wallet.
          */
-        public Builder web3Wallet(Optional<? extends java.util.List<String>> web3Wallet) {
+        public Builder web3Wallet(Optional<? extends List<String>> web3Wallet) {
             Utils.checkNotNull(web3Wallet, "web3Wallet");
             this.web3Wallet = web3Wallet;
             return this;
@@ -1525,7 +1517,7 @@ public Builder username(String username) {
          * The username to give to the user.
          * It must be unique across your instance.
          */
-        public Builder username(JsonNullable<? extends String> username) {
+        public Builder username(JsonNullable<String> username) {
             Utils.checkNotNull(username, "username");
             this.username = username;
             return this;
@@ -1545,7 +1537,7 @@ public Builder password(String password) {
          * The plaintext password to give the user.
          * Must be at least 8 characters long, and can not be in any list of hacked passwords.
          */
-        public Builder password(JsonNullable<? extends String> password) {
+        public Builder password(JsonNullable<String> password) {
             Utils.checkNotNull(password, "password");
             this.password = password;
             return this;
@@ -1567,7 +1559,7 @@ public Builder passwordDigest(String passwordDigest) {
          * The digests should be generated with one of the supported algorithms.
          * The hashing algorithm can be specified using the `password_hasher` property.
          */
-        public Builder passwordDigest(Optional<? extends String> passwordDigest) {
+        public Builder passwordDigest(Optional<String> passwordDigest) {
             Utils.checkNotNull(passwordDigest, "passwordDigest");
             this.passwordDigest = passwordDigest;
             return this;
@@ -1851,7 +1843,7 @@ public Builder skipPasswordChecks(boolean skipPasswordChecks) {
          * It is recommended to use this method only when migrating plaintext passwords to Clerk.
          * Upon migration the user base should be prompted to pick stronger password.
          */
-        public Builder skipPasswordChecks(Optional<? extends Boolean> skipPasswordChecks) {
+        public Builder skipPasswordChecks(Optional<Boolean> skipPasswordChecks) {
             Utils.checkNotNull(skipPasswordChecks, "skipPasswordChecks");
             this.skipPasswordChecks = skipPasswordChecks;
             return this;
@@ -1873,7 +1865,7 @@ public Builder skipPasswordRequirement(boolean skipPasswordRequirement) {
          * This is useful when you are trying to create a user that doesn't have a password, in an instance that is using passwords.
          * Please note that you cannot use this flag if password is the only way for a user to sign into your instance.
          */
-        public Builder skipPasswordRequirement(Optional<? extends Boolean> skipPasswordRequirement) {
+        public Builder skipPasswordRequirement(Optional<Boolean> skipPasswordRequirement) {
             Utils.checkNotNull(skipPasswordRequirement, "skipPasswordRequirement");
             this.skipPasswordRequirement = skipPasswordRequirement;
             return this;
@@ -1899,7 +1891,7 @@ public Builder totpSecret(String totpSecret) {
          * * Code length: 6 digits
          * * Algorithm: SHA1
          */
-        public Builder totpSecret(Optional<? extends String> totpSecret) {
+        public Builder totpSecret(Optional<String> totpSecret) {
             Utils.checkNotNull(totpSecret, "totpSecret");
             this.totpSecret = totpSecret;
             return this;
@@ -1909,7 +1901,7 @@ public Builder totpSecret(Optional<? extends String> totpSecret) {
          * If Backup Codes are configured on the instance, you can provide them to enable it on the newly created user without the need to reset them.
          * You must provide the backup codes in plain format or the corresponding bcrypt digest.
          */
-        public Builder backupCodes(java.util.List<String> backupCodes) {
+        public Builder backupCodes(List<String> backupCodes) {
             Utils.checkNotNull(backupCodes, "backupCodes");
             this.backupCodes = Optional.ofNullable(backupCodes);
             return this;
@@ -1919,7 +1911,7 @@ public Builder backupCodes(java.util.List<String> backupCodes) {
          * If Backup Codes are configured on the instance, you can provide them to enable it on the newly created user without the need to reset them.
          * You must provide the backup codes in plain format or the corresponding bcrypt digest.
          */
-        public Builder backupCodes(Optional<? extends java.util.List<String>> backupCodes) {
+        public Builder backupCodes(Optional<? extends List<String>> backupCodes) {
             Utils.checkNotNull(backupCodes, "backupCodes");
             this.backupCodes = backupCodes;
             return this;
@@ -1993,7 +1985,7 @@ public Builder createdAt(String createdAt) {
         /**
          * A custom date/time denoting _when_ the user signed up to the application, specified in RFC3339 format (e.g. `2012-10-20T07:15:20.902Z`).
          */
-        public Builder createdAt(Optional<? extends String> createdAt) {
+        public Builder createdAt(Optional<String> createdAt) {
             Utils.checkNotNull(createdAt, "createdAt");
             this.createdAt = createdAt;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateUserRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/CreateUserRequestBuilder.java
index dd95e14..77c1dd1 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateUserRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateUserRequestBuilder.java
@@ -4,18 +4,7 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class CreateUserRequestBuilder {
 
@@ -26,7 +15,7 @@ public CreateUserRequestBuilder(SDKMethodInterfaces.MethodCallCreateUser sdk) {
         this.sdk = sdk;
     }
 
-    public CreateUserRequestBuilder request(CreateUserRequestBody request) {
+    public CreateUserRequestBuilder request(com.clerk.backend_api.models.operations.CreateUserRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/CreateUserResponse.java b/src/main/java/com/clerk/backend_api/models/operations/CreateUserResponse.java
index 624a633..9241e3a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/CreateUserResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/CreateUserResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.User;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class CreateUserResponse implements com.clerk.backend_api.utils.Response {
+
+public class CreateUserResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class CreateUserResponse implements com.clerk.backend_api.utils.Response
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.User> user;
+    private Optional<? extends User> user;
 
     @JsonCreator
     public CreateUserResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.User> user) {
+            Optional<? extends User> user) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.User> user() {
-        return (Optional<com.clerk.backend_api.models.components.User>) user;
+    public Optional<User> user() {
+        return (Optional<User>) user;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public CreateUserResponse withRawResponse(HttpResponse<InputStream> rawResponse)
     /**
      * Success
      */
-    public CreateUserResponse withUser(com.clerk.backend_api.models.components.User user) {
+    public CreateUserResponse withUser(User user) {
         Utils.checkNotNull(user, "user");
         this.user = Optional.ofNullable(user);
         return this;
@@ -137,7 +141,7 @@ public CreateUserResponse withUser(com.clerk.backend_api.models.components.User
     /**
      * Success
      */
-    public CreateUserResponse withUser(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+    public CreateUserResponse withUser(Optional<? extends User> user) {
         Utils.checkNotNull(user, "user");
         this.user = user;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         CreateUserResponse other = (CreateUserResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.user, other.user);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.user, other.user);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.User> user = Optional.empty();  
+        private Optional<? extends User> user = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder user(com.clerk.backend_api.models.components.User user) {
+        public Builder user(User user) {
             Utils.checkNotNull(user, "user");
             this.user = Optional.ofNullable(user);
             return this;
@@ -230,7 +234,7 @@ public Builder user(com.clerk.backend_api.models.components.User user) {
         /**
          * Success
          */
-        public Builder user(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+        public Builder user(Optional<? extends User> user) {
             Utils.checkNotNull(user, "user");
             this.user = user;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteAllowlistIdentifierRequest.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteAllowlistIdentifierRequest.java
index 1afc79d..1d3052e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteAllowlistIdentifierRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteAllowlistIdentifierRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DeleteAllowlistIdentifierRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteAllowlistIdentifierRequest other = (DeleteAllowlistIdentifierRequest) o;
         return 
-            java.util.Objects.deepEquals(this.identifierId, other.identifierId);
+            Objects.deepEquals(this.identifierId, other.identifierId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             identifierId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteAllowlistIdentifierRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteAllowlistIdentifierRequestBuilder.java
index 97f1d61..fc58614 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteAllowlistIdentifierRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteAllowlistIdentifierRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DeleteAllowlistIdentifierRequestBuilder {
 
@@ -26,7 +16,7 @@ public DeleteAllowlistIdentifierRequestBuilder(SDKMethodInterfaces.MethodCallDel
         this.sdk = sdk;
     }
 
-    public DeleteAllowlistIdentifierRequestBuilder identifierId(String identifierId) {
+    public DeleteAllowlistIdentifierRequestBuilder identifierId(java.lang.String identifierId) {
         Utils.checkNotNull(identifierId, "identifierId");
         this.identifierId = identifierId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteAllowlistIdentifierResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteAllowlistIdentifierResponse.java
index 0cddd06..3ecf7c1 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteAllowlistIdentifierResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteAllowlistIdentifierResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DeleteAllowlistIdentifierResponse implements com.clerk.backend_api.utils.Response {
+
+public class DeleteAllowlistIdentifierResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class DeleteAllowlistIdentifierResponse implements com.clerk.backend_api.
     /**
      * Deleted Object
      */
-    private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject;
+    private Optional<? extends DeletedObject> deletedObject;
 
     @JsonCreator
     public DeleteAllowlistIdentifierResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+            Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.DeletedObject> deletedObject() {
-        return (Optional<com.clerk.backend_api.models.components.DeletedObject>) deletedObject;
+    public Optional<DeletedObject> deletedObject() {
+        return (Optional<DeletedObject>) deletedObject;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public DeleteAllowlistIdentifierResponse withRawResponse(HttpResponse<InputStrea
     /**
      * Deleted Object
      */
-    public DeleteAllowlistIdentifierResponse withDeletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+    public DeleteAllowlistIdentifierResponse withDeletedObject(DeletedObject deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = Optional.ofNullable(deletedObject);
         return this;
@@ -137,7 +141,7 @@ public DeleteAllowlistIdentifierResponse withDeletedObject(com.clerk.backend_api
     /**
      * Deleted Object
      */
-    public DeleteAllowlistIdentifierResponse withDeletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+    public DeleteAllowlistIdentifierResponse withDeletedObject(Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = deletedObject;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteAllowlistIdentifierResponse other = (DeleteAllowlistIdentifierResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.deletedObject, other.deletedObject);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.deletedObject, other.deletedObject);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject = Optional.empty();  
+        private Optional<? extends DeletedObject> deletedObject = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Deleted Object
          */
-        public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+        public Builder deletedObject(DeletedObject deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = Optional.ofNullable(deletedObject);
             return this;
@@ -230,7 +234,7 @@ public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObje
         /**
          * Deleted Object
          */
-        public Builder deletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+        public Builder deletedObject(Optional<? extends DeletedObject> deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = deletedObject;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteBlocklistIdentifierRequest.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteBlocklistIdentifierRequest.java
index 49c995b..edb80be 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteBlocklistIdentifierRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteBlocklistIdentifierRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DeleteBlocklistIdentifierRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteBlocklistIdentifierRequest other = (DeleteBlocklistIdentifierRequest) o;
         return 
-            java.util.Objects.deepEquals(this.identifierId, other.identifierId);
+            Objects.deepEquals(this.identifierId, other.identifierId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             identifierId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteBlocklistIdentifierRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteBlocklistIdentifierRequestBuilder.java
index 9c2a6e7..b2fd8d7 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteBlocklistIdentifierRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteBlocklistIdentifierRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DeleteBlocklistIdentifierRequestBuilder {
 
@@ -26,7 +16,7 @@ public DeleteBlocklistIdentifierRequestBuilder(SDKMethodInterfaces.MethodCallDel
         this.sdk = sdk;
     }
 
-    public DeleteBlocklistIdentifierRequestBuilder identifierId(String identifierId) {
+    public DeleteBlocklistIdentifierRequestBuilder identifierId(java.lang.String identifierId) {
         Utils.checkNotNull(identifierId, "identifierId");
         this.identifierId = identifierId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteBlocklistIdentifierResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteBlocklistIdentifierResponse.java
index ecf28b7..d9b7e72 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteBlocklistIdentifierResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteBlocklistIdentifierResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DeleteBlocklistIdentifierResponse implements com.clerk.backend_api.utils.Response {
+
+public class DeleteBlocklistIdentifierResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class DeleteBlocklistIdentifierResponse implements com.clerk.backend_api.
     /**
      * Deleted Object
      */
-    private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject;
+    private Optional<? extends DeletedObject> deletedObject;
 
     @JsonCreator
     public DeleteBlocklistIdentifierResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+            Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.DeletedObject> deletedObject() {
-        return (Optional<com.clerk.backend_api.models.components.DeletedObject>) deletedObject;
+    public Optional<DeletedObject> deletedObject() {
+        return (Optional<DeletedObject>) deletedObject;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public DeleteBlocklistIdentifierResponse withRawResponse(HttpResponse<InputStrea
     /**
      * Deleted Object
      */
-    public DeleteBlocklistIdentifierResponse withDeletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+    public DeleteBlocklistIdentifierResponse withDeletedObject(DeletedObject deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = Optional.ofNullable(deletedObject);
         return this;
@@ -137,7 +141,7 @@ public DeleteBlocklistIdentifierResponse withDeletedObject(com.clerk.backend_api
     /**
      * Deleted Object
      */
-    public DeleteBlocklistIdentifierResponse withDeletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+    public DeleteBlocklistIdentifierResponse withDeletedObject(Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = deletedObject;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteBlocklistIdentifierResponse other = (DeleteBlocklistIdentifierResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.deletedObject, other.deletedObject);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.deletedObject, other.deletedObject);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject = Optional.empty();  
+        private Optional<? extends DeletedObject> deletedObject = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Deleted Object
          */
-        public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+        public Builder deletedObject(DeletedObject deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = Optional.ofNullable(deletedObject);
             return this;
@@ -230,7 +234,7 @@ public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObje
         /**
          * Deleted Object
          */
-        public Builder deletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+        public Builder deletedObject(Optional<? extends DeletedObject> deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = deletedObject;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteDomainRequest.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteDomainRequest.java
index 3651ce0..e1c087a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteDomainRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteDomainRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DeleteDomainRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteDomainRequest other = (DeleteDomainRequest) o;
         return 
-            java.util.Objects.deepEquals(this.domainId, other.domainId);
+            Objects.deepEquals(this.domainId, other.domainId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             domainId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteDomainRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteDomainRequestBuilder.java
index 4101121..a5dbba4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteDomainRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteDomainRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DeleteDomainRequestBuilder {
 
@@ -26,7 +16,7 @@ public DeleteDomainRequestBuilder(SDKMethodInterfaces.MethodCallDeleteDomain sdk
         this.sdk = sdk;
     }
 
-    public DeleteDomainRequestBuilder domainId(String domainId) {
+    public DeleteDomainRequestBuilder domainId(java.lang.String domainId) {
         Utils.checkNotNull(domainId, "domainId");
         this.domainId = domainId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteDomainResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteDomainResponse.java
index 88b3a76..4de453c 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteDomainResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteDomainResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DeleteDomainResponse implements com.clerk.backend_api.utils.Response {
+
+public class DeleteDomainResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class DeleteDomainResponse implements com.clerk.backend_api.utils.Respons
     /**
      * Deleted Object
      */
-    private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject;
+    private Optional<? extends DeletedObject> deletedObject;
 
     @JsonCreator
     public DeleteDomainResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+            Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.DeletedObject> deletedObject() {
-        return (Optional<com.clerk.backend_api.models.components.DeletedObject>) deletedObject;
+    public Optional<DeletedObject> deletedObject() {
+        return (Optional<DeletedObject>) deletedObject;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public DeleteDomainResponse withRawResponse(HttpResponse<InputStream> rawRespons
     /**
      * Deleted Object
      */
-    public DeleteDomainResponse withDeletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+    public DeleteDomainResponse withDeletedObject(DeletedObject deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = Optional.ofNullable(deletedObject);
         return this;
@@ -137,7 +141,7 @@ public DeleteDomainResponse withDeletedObject(com.clerk.backend_api.models.compo
     /**
      * Deleted Object
      */
-    public DeleteDomainResponse withDeletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+    public DeleteDomainResponse withDeletedObject(Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = deletedObject;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteDomainResponse other = (DeleteDomainResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.deletedObject, other.deletedObject);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.deletedObject, other.deletedObject);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject = Optional.empty();  
+        private Optional<? extends DeletedObject> deletedObject = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Deleted Object
          */
-        public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+        public Builder deletedObject(DeletedObject deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = Optional.ofNullable(deletedObject);
             return this;
@@ -230,7 +234,7 @@ public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObje
         /**
          * Deleted Object
          */
-        public Builder deletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+        public Builder deletedObject(Optional<? extends DeletedObject> deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = deletedObject;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteEmailAddressRequest.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteEmailAddressRequest.java
index d2765a9..e57f1f9 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteEmailAddressRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteEmailAddressRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DeleteEmailAddressRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteEmailAddressRequest other = (DeleteEmailAddressRequest) o;
         return 
-            java.util.Objects.deepEquals(this.emailAddressId, other.emailAddressId);
+            Objects.deepEquals(this.emailAddressId, other.emailAddressId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             emailAddressId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteEmailAddressRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteEmailAddressRequestBuilder.java
index 7cd505f..05f5a20 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteEmailAddressRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteEmailAddressRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DeleteEmailAddressRequestBuilder {
 
@@ -26,7 +16,7 @@ public DeleteEmailAddressRequestBuilder(SDKMethodInterfaces.MethodCallDeleteEmai
         this.sdk = sdk;
     }
 
-    public DeleteEmailAddressRequestBuilder emailAddressId(String emailAddressId) {
+    public DeleteEmailAddressRequestBuilder emailAddressId(java.lang.String emailAddressId) {
         Utils.checkNotNull(emailAddressId, "emailAddressId");
         this.emailAddressId = emailAddressId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteEmailAddressResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteEmailAddressResponse.java
index dad7913..0f306f0 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteEmailAddressResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteEmailAddressResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DeleteEmailAddressResponse implements com.clerk.backend_api.utils.Response {
+
+public class DeleteEmailAddressResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class DeleteEmailAddressResponse implements com.clerk.backend_api.utils.R
     /**
      * Deleted Object
      */
-    private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject;
+    private Optional<? extends DeletedObject> deletedObject;
 
     @JsonCreator
     public DeleteEmailAddressResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+            Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.DeletedObject> deletedObject() {
-        return (Optional<com.clerk.backend_api.models.components.DeletedObject>) deletedObject;
+    public Optional<DeletedObject> deletedObject() {
+        return (Optional<DeletedObject>) deletedObject;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public DeleteEmailAddressResponse withRawResponse(HttpResponse<InputStream> rawR
     /**
      * Deleted Object
      */
-    public DeleteEmailAddressResponse withDeletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+    public DeleteEmailAddressResponse withDeletedObject(DeletedObject deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = Optional.ofNullable(deletedObject);
         return this;
@@ -137,7 +141,7 @@ public DeleteEmailAddressResponse withDeletedObject(com.clerk.backend_api.models
     /**
      * Deleted Object
      */
-    public DeleteEmailAddressResponse withDeletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+    public DeleteEmailAddressResponse withDeletedObject(Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = deletedObject;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteEmailAddressResponse other = (DeleteEmailAddressResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.deletedObject, other.deletedObject);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.deletedObject, other.deletedObject);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject = Optional.empty();  
+        private Optional<? extends DeletedObject> deletedObject = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Deleted Object
          */
-        public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+        public Builder deletedObject(DeletedObject deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = Optional.ofNullable(deletedObject);
             return this;
@@ -230,7 +234,7 @@ public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObje
         /**
          * Deleted Object
          */
-        public Builder deletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+        public Builder deletedObject(Optional<? extends DeletedObject> deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = deletedObject;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteJWTTemplateRequest.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteJWTTemplateRequest.java
index 2b9c3cf..e027583 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteJWTTemplateRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteJWTTemplateRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DeleteJWTTemplateRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteJWTTemplateRequest other = (DeleteJWTTemplateRequest) o;
         return 
-            java.util.Objects.deepEquals(this.templateId, other.templateId);
+            Objects.deepEquals(this.templateId, other.templateId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             templateId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteJWTTemplateRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteJWTTemplateRequestBuilder.java
index ff400b3..8a8ebea 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteJWTTemplateRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteJWTTemplateRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DeleteJWTTemplateRequestBuilder {
 
@@ -26,7 +16,7 @@ public DeleteJWTTemplateRequestBuilder(SDKMethodInterfaces.MethodCallDeleteJWTTe
         this.sdk = sdk;
     }
 
-    public DeleteJWTTemplateRequestBuilder templateId(String templateId) {
+    public DeleteJWTTemplateRequestBuilder templateId(java.lang.String templateId) {
         Utils.checkNotNull(templateId, "templateId");
         this.templateId = templateId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteJWTTemplateResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteJWTTemplateResponse.java
index 1974761..8e695d8 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteJWTTemplateResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteJWTTemplateResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DeleteJWTTemplateResponse implements com.clerk.backend_api.utils.Response {
+
+public class DeleteJWTTemplateResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class DeleteJWTTemplateResponse implements com.clerk.backend_api.utils.Re
     /**
      * Deleted Object
      */
-    private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject;
+    private Optional<? extends DeletedObject> deletedObject;
 
     @JsonCreator
     public DeleteJWTTemplateResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+            Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.DeletedObject> deletedObject() {
-        return (Optional<com.clerk.backend_api.models.components.DeletedObject>) deletedObject;
+    public Optional<DeletedObject> deletedObject() {
+        return (Optional<DeletedObject>) deletedObject;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public DeleteJWTTemplateResponse withRawResponse(HttpResponse<InputStream> rawRe
     /**
      * Deleted Object
      */
-    public DeleteJWTTemplateResponse withDeletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+    public DeleteJWTTemplateResponse withDeletedObject(DeletedObject deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = Optional.ofNullable(deletedObject);
         return this;
@@ -137,7 +141,7 @@ public DeleteJWTTemplateResponse withDeletedObject(com.clerk.backend_api.models.
     /**
      * Deleted Object
      */
-    public DeleteJWTTemplateResponse withDeletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+    public DeleteJWTTemplateResponse withDeletedObject(Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = deletedObject;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteJWTTemplateResponse other = (DeleteJWTTemplateResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.deletedObject, other.deletedObject);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.deletedObject, other.deletedObject);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject = Optional.empty();  
+        private Optional<? extends DeletedObject> deletedObject = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Deleted Object
          */
-        public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+        public Builder deletedObject(DeletedObject deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = Optional.ofNullable(deletedObject);
             return this;
@@ -230,7 +234,7 @@ public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObje
         /**
          * Deleted Object
          */
-        public Builder deletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+        public Builder deletedObject(Optional<? extends DeletedObject> deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = deletedObject;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteOAuthApplicationRequest.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteOAuthApplicationRequest.java
index 6b6ddda..7ccd816 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteOAuthApplicationRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteOAuthApplicationRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DeleteOAuthApplicationRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteOAuthApplicationRequest other = (DeleteOAuthApplicationRequest) o;
         return 
-            java.util.Objects.deepEquals(this.oauthApplicationId, other.oauthApplicationId);
+            Objects.deepEquals(this.oauthApplicationId, other.oauthApplicationId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             oauthApplicationId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteOAuthApplicationRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteOAuthApplicationRequestBuilder.java
index 6919623..4f6de5e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteOAuthApplicationRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteOAuthApplicationRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DeleteOAuthApplicationRequestBuilder {
 
@@ -26,7 +16,7 @@ public DeleteOAuthApplicationRequestBuilder(SDKMethodInterfaces.MethodCallDelete
         this.sdk = sdk;
     }
 
-    public DeleteOAuthApplicationRequestBuilder oauthApplicationId(String oauthApplicationId) {
+    public DeleteOAuthApplicationRequestBuilder oauthApplicationId(java.lang.String oauthApplicationId) {
         Utils.checkNotNull(oauthApplicationId, "oauthApplicationId");
         this.oauthApplicationId = oauthApplicationId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteOAuthApplicationResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteOAuthApplicationResponse.java
index 751167b..0c9963b 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteOAuthApplicationResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteOAuthApplicationResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DeleteOAuthApplicationResponse implements com.clerk.backend_api.utils.Response {
+
+public class DeleteOAuthApplicationResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class DeleteOAuthApplicationResponse implements com.clerk.backend_api.uti
     /**
      * Deleted Object
      */
-    private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject;
+    private Optional<? extends DeletedObject> deletedObject;
 
     @JsonCreator
     public DeleteOAuthApplicationResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+            Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.DeletedObject> deletedObject() {
-        return (Optional<com.clerk.backend_api.models.components.DeletedObject>) deletedObject;
+    public Optional<DeletedObject> deletedObject() {
+        return (Optional<DeletedObject>) deletedObject;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public DeleteOAuthApplicationResponse withRawResponse(HttpResponse<InputStream>
     /**
      * Deleted Object
      */
-    public DeleteOAuthApplicationResponse withDeletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+    public DeleteOAuthApplicationResponse withDeletedObject(DeletedObject deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = Optional.ofNullable(deletedObject);
         return this;
@@ -137,7 +141,7 @@ public DeleteOAuthApplicationResponse withDeletedObject(com.clerk.backend_api.mo
     /**
      * Deleted Object
      */
-    public DeleteOAuthApplicationResponse withDeletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+    public DeleteOAuthApplicationResponse withDeletedObject(Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = deletedObject;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteOAuthApplicationResponse other = (DeleteOAuthApplicationResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.deletedObject, other.deletedObject);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.deletedObject, other.deletedObject);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject = Optional.empty();  
+        private Optional<? extends DeletedObject> deletedObject = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Deleted Object
          */
-        public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+        public Builder deletedObject(DeletedObject deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = Optional.ofNullable(deletedObject);
             return this;
@@ -230,7 +234,7 @@ public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObje
         /**
          * Deleted Object
          */
-        public Builder deletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+        public Builder deletedObject(Optional<? extends DeletedObject> deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = deletedObject;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationLogoRequest.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationLogoRequest.java
index 295ae9a..76c044b 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationLogoRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationLogoRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DeleteOrganizationLogoRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteOrganizationLogoRequest other = (DeleteOrganizationLogoRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId);
+            Objects.deepEquals(this.organizationId, other.organizationId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationLogoRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationLogoRequestBuilder.java
index 12976c2..2a1ed5e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationLogoRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationLogoRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DeleteOrganizationLogoRequestBuilder {
 
@@ -26,7 +16,7 @@ public DeleteOrganizationLogoRequestBuilder(SDKMethodInterfaces.MethodCallDelete
         this.sdk = sdk;
     }
 
-    public DeleteOrganizationLogoRequestBuilder organizationId(String organizationId) {
+    public DeleteOrganizationLogoRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationLogoResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationLogoResponse.java
index ba147cc..dbc8b40 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationLogoResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationLogoResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Organization;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DeleteOrganizationLogoResponse implements com.clerk.backend_api.utils.Response {
+
+public class DeleteOrganizationLogoResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class DeleteOrganizationLogoResponse implements com.clerk.backend_api.uti
     /**
      * An organization
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Organization> organization;
+    private Optional<? extends Organization> organization;
 
     @JsonCreator
     public DeleteOrganizationLogoResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+            Optional<? extends Organization> organization) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Organization> organization() {
-        return (Optional<com.clerk.backend_api.models.components.Organization>) organization;
+    public Optional<Organization> organization() {
+        return (Optional<Organization>) organization;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public DeleteOrganizationLogoResponse withRawResponse(HttpResponse<InputStream>
     /**
      * An organization
      */
-    public DeleteOrganizationLogoResponse withOrganization(com.clerk.backend_api.models.components.Organization organization) {
+    public DeleteOrganizationLogoResponse withOrganization(Organization organization) {
         Utils.checkNotNull(organization, "organization");
         this.organization = Optional.ofNullable(organization);
         return this;
@@ -137,7 +141,7 @@ public DeleteOrganizationLogoResponse withOrganization(com.clerk.backend_api.mod
     /**
      * An organization
      */
-    public DeleteOrganizationLogoResponse withOrganization(Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+    public DeleteOrganizationLogoResponse withOrganization(Optional<? extends Organization> organization) {
         Utils.checkNotNull(organization, "organization");
         this.organization = organization;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteOrganizationLogoResponse other = (DeleteOrganizationLogoResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organization, other.organization);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organization, other.organization);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Organization> organization = Optional.empty();  
+        private Optional<? extends Organization> organization = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * An organization
          */
-        public Builder organization(com.clerk.backend_api.models.components.Organization organization) {
+        public Builder organization(Organization organization) {
             Utils.checkNotNull(organization, "organization");
             this.organization = Optional.ofNullable(organization);
             return this;
@@ -230,7 +234,7 @@ public Builder organization(com.clerk.backend_api.models.components.Organization
         /**
          * An organization
          */
-        public Builder organization(Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+        public Builder organization(Optional<? extends Organization> organization) {
             Utils.checkNotNull(organization, "organization");
             this.organization = organization;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationMembershipRequest.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationMembershipRequest.java
index 4e5d210..7b04dcf 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationMembershipRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationMembershipRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DeleteOrganizationMembershipRequest {
 
@@ -87,13 +86,13 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteOrganizationMembershipRequest other = (DeleteOrganizationMembershipRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.userId, other.userId);
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.userId, other.userId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId,
             userId);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationMembershipRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationMembershipRequestBuilder.java
index 30d1000..0df3df5 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationMembershipRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationMembershipRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DeleteOrganizationMembershipRequestBuilder {
 
@@ -27,13 +17,13 @@ public DeleteOrganizationMembershipRequestBuilder(SDKMethodInterfaces.MethodCall
         this.sdk = sdk;
     }
 
-    public DeleteOrganizationMembershipRequestBuilder organizationId(String organizationId) {
+    public DeleteOrganizationMembershipRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
     }
 
-    public DeleteOrganizationMembershipRequestBuilder userId(String userId) {
+    public DeleteOrganizationMembershipRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationMembershipResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationMembershipResponse.java
index eff0903..58cb5bf 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationMembershipResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationMembershipResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OrganizationMembership;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DeleteOrganizationMembershipResponse implements com.clerk.backend_api.utils.Response {
+
+public class DeleteOrganizationMembershipResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class DeleteOrganizationMembershipResponse implements com.clerk.backend_a
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership;
+    private Optional<? extends OrganizationMembership> organizationMembership;
 
     @JsonCreator
     public DeleteOrganizationMembershipResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership) {
+            Optional<? extends OrganizationMembership> organizationMembership) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership() {
-        return (Optional<com.clerk.backend_api.models.components.OrganizationMembership>) organizationMembership;
+    public Optional<OrganizationMembership> organizationMembership() {
+        return (Optional<OrganizationMembership>) organizationMembership;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public DeleteOrganizationMembershipResponse withRawResponse(HttpResponse<InputSt
     /**
      * Success
      */
-    public DeleteOrganizationMembershipResponse withOrganizationMembership(com.clerk.backend_api.models.components.OrganizationMembership organizationMembership) {
+    public DeleteOrganizationMembershipResponse withOrganizationMembership(OrganizationMembership organizationMembership) {
         Utils.checkNotNull(organizationMembership, "organizationMembership");
         this.organizationMembership = Optional.ofNullable(organizationMembership);
         return this;
@@ -137,7 +141,7 @@ public DeleteOrganizationMembershipResponse withOrganizationMembership(com.clerk
     /**
      * Success
      */
-    public DeleteOrganizationMembershipResponse withOrganizationMembership(Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership) {
+    public DeleteOrganizationMembershipResponse withOrganizationMembership(Optional<? extends OrganizationMembership> organizationMembership) {
         Utils.checkNotNull(organizationMembership, "organizationMembership");
         this.organizationMembership = organizationMembership;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteOrganizationMembershipResponse other = (DeleteOrganizationMembershipResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizationMembership, other.organizationMembership);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizationMembership, other.organizationMembership);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership = Optional.empty();  
+        private Optional<? extends OrganizationMembership> organizationMembership = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder organizationMembership(com.clerk.backend_api.models.components.OrganizationMembership organizationMembership) {
+        public Builder organizationMembership(OrganizationMembership organizationMembership) {
             Utils.checkNotNull(organizationMembership, "organizationMembership");
             this.organizationMembership = Optional.ofNullable(organizationMembership);
             return this;
@@ -230,7 +234,7 @@ public Builder organizationMembership(com.clerk.backend_api.models.components.Or
         /**
          * Success
          */
-        public Builder organizationMembership(Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership) {
+        public Builder organizationMembership(Optional<? extends OrganizationMembership> organizationMembership) {
             Utils.checkNotNull(organizationMembership, "organizationMembership");
             this.organizationMembership = organizationMembership;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationRequest.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationRequest.java
index d53367b..215bee6 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DeleteOrganizationRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteOrganizationRequest other = (DeleteOrganizationRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId);
+            Objects.deepEquals(this.organizationId, other.organizationId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationRequestBuilder.java
index 69af612..ebb2fdb 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DeleteOrganizationRequestBuilder {
 
@@ -26,7 +16,7 @@ public DeleteOrganizationRequestBuilder(SDKMethodInterfaces.MethodCallDeleteOrga
         this.sdk = sdk;
     }
 
-    public DeleteOrganizationRequestBuilder organizationId(String organizationId) {
+    public DeleteOrganizationRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationResponse.java
index 31d155a..391587c 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteOrganizationResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DeleteOrganizationResponse implements com.clerk.backend_api.utils.Response {
+
+public class DeleteOrganizationResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class DeleteOrganizationResponse implements com.clerk.backend_api.utils.R
     /**
      * Deleted Object
      */
-    private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject;
+    private Optional<? extends DeletedObject> deletedObject;
 
     @JsonCreator
     public DeleteOrganizationResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+            Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.DeletedObject> deletedObject() {
-        return (Optional<com.clerk.backend_api.models.components.DeletedObject>) deletedObject;
+    public Optional<DeletedObject> deletedObject() {
+        return (Optional<DeletedObject>) deletedObject;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public DeleteOrganizationResponse withRawResponse(HttpResponse<InputStream> rawR
     /**
      * Deleted Object
      */
-    public DeleteOrganizationResponse withDeletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+    public DeleteOrganizationResponse withDeletedObject(DeletedObject deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = Optional.ofNullable(deletedObject);
         return this;
@@ -137,7 +141,7 @@ public DeleteOrganizationResponse withDeletedObject(com.clerk.backend_api.models
     /**
      * Deleted Object
      */
-    public DeleteOrganizationResponse withDeletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+    public DeleteOrganizationResponse withDeletedObject(Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = deletedObject;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteOrganizationResponse other = (DeleteOrganizationResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.deletedObject, other.deletedObject);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.deletedObject, other.deletedObject);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject = Optional.empty();  
+        private Optional<? extends DeletedObject> deletedObject = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Deleted Object
          */
-        public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+        public Builder deletedObject(DeletedObject deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = Optional.ofNullable(deletedObject);
             return this;
@@ -230,7 +234,7 @@ public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObje
         /**
          * Deleted Object
          */
-        public Builder deletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+        public Builder deletedObject(Optional<? extends DeletedObject> deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = deletedObject;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeletePhoneNumberRequest.java b/src/main/java/com/clerk/backend_api/models/operations/DeletePhoneNumberRequest.java
index bfbc477..e8ed66b 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeletePhoneNumberRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeletePhoneNumberRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DeletePhoneNumberRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         DeletePhoneNumberRequest other = (DeletePhoneNumberRequest) o;
         return 
-            java.util.Objects.deepEquals(this.phoneNumberId, other.phoneNumberId);
+            Objects.deepEquals(this.phoneNumberId, other.phoneNumberId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             phoneNumberId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeletePhoneNumberRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeletePhoneNumberRequestBuilder.java
index 611f5cc..731b11b 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeletePhoneNumberRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeletePhoneNumberRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DeletePhoneNumberRequestBuilder {
 
@@ -26,7 +16,7 @@ public DeletePhoneNumberRequestBuilder(SDKMethodInterfaces.MethodCallDeletePhone
         this.sdk = sdk;
     }
 
-    public DeletePhoneNumberRequestBuilder phoneNumberId(String phoneNumberId) {
+    public DeletePhoneNumberRequestBuilder phoneNumberId(java.lang.String phoneNumberId) {
         Utils.checkNotNull(phoneNumberId, "phoneNumberId");
         this.phoneNumberId = phoneNumberId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeletePhoneNumberResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeletePhoneNumberResponse.java
index 7aa98cf..845875e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeletePhoneNumberResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeletePhoneNumberResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DeletePhoneNumberResponse implements com.clerk.backend_api.utils.Response {
+
+public class DeletePhoneNumberResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class DeletePhoneNumberResponse implements com.clerk.backend_api.utils.Re
     /**
      * Deleted Object
      */
-    private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject;
+    private Optional<? extends DeletedObject> deletedObject;
 
     @JsonCreator
     public DeletePhoneNumberResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+            Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.DeletedObject> deletedObject() {
-        return (Optional<com.clerk.backend_api.models.components.DeletedObject>) deletedObject;
+    public Optional<DeletedObject> deletedObject() {
+        return (Optional<DeletedObject>) deletedObject;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public DeletePhoneNumberResponse withRawResponse(HttpResponse<InputStream> rawRe
     /**
      * Deleted Object
      */
-    public DeletePhoneNumberResponse withDeletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+    public DeletePhoneNumberResponse withDeletedObject(DeletedObject deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = Optional.ofNullable(deletedObject);
         return this;
@@ -137,7 +141,7 @@ public DeletePhoneNumberResponse withDeletedObject(com.clerk.backend_api.models.
     /**
      * Deleted Object
      */
-    public DeletePhoneNumberResponse withDeletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+    public DeletePhoneNumberResponse withDeletedObject(Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = deletedObject;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeletePhoneNumberResponse other = (DeletePhoneNumberResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.deletedObject, other.deletedObject);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.deletedObject, other.deletedObject);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject = Optional.empty();  
+        private Optional<? extends DeletedObject> deletedObject = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Deleted Object
          */
-        public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+        public Builder deletedObject(DeletedObject deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = Optional.ofNullable(deletedObject);
             return this;
@@ -230,7 +234,7 @@ public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObje
         /**
          * Deleted Object
          */
-        public Builder deletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+        public Builder deletedObject(Optional<? extends DeletedObject> deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = deletedObject;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteRedirectURLRequest.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteRedirectURLRequest.java
index 83693a6..a2693b5 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteRedirectURLRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteRedirectURLRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DeleteRedirectURLRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteRedirectURLRequest other = (DeleteRedirectURLRequest) o;
         return 
-            java.util.Objects.deepEquals(this.id, other.id);
+            Objects.deepEquals(this.id, other.id);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             id);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteRedirectURLRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteRedirectURLRequestBuilder.java
index a8b4d40..e49c851 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteRedirectURLRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteRedirectURLRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DeleteRedirectURLRequestBuilder {
 
@@ -26,7 +16,7 @@ public DeleteRedirectURLRequestBuilder(SDKMethodInterfaces.MethodCallDeleteRedir
         this.sdk = sdk;
     }
 
-    public DeleteRedirectURLRequestBuilder id(String id) {
+    public DeleteRedirectURLRequestBuilder id(java.lang.String id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteRedirectURLResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteRedirectURLResponse.java
index faa08b3..55f42d4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteRedirectURLResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteRedirectURLResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DeleteRedirectURLResponse implements com.clerk.backend_api.utils.Response {
+
+public class DeleteRedirectURLResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class DeleteRedirectURLResponse implements com.clerk.backend_api.utils.Re
     /**
      * Deleted Object
      */
-    private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject;
+    private Optional<? extends DeletedObject> deletedObject;
 
     @JsonCreator
     public DeleteRedirectURLResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+            Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.DeletedObject> deletedObject() {
-        return (Optional<com.clerk.backend_api.models.components.DeletedObject>) deletedObject;
+    public Optional<DeletedObject> deletedObject() {
+        return (Optional<DeletedObject>) deletedObject;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public DeleteRedirectURLResponse withRawResponse(HttpResponse<InputStream> rawRe
     /**
      * Deleted Object
      */
-    public DeleteRedirectURLResponse withDeletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+    public DeleteRedirectURLResponse withDeletedObject(DeletedObject deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = Optional.ofNullable(deletedObject);
         return this;
@@ -137,7 +141,7 @@ public DeleteRedirectURLResponse withDeletedObject(com.clerk.backend_api.models.
     /**
      * Deleted Object
      */
-    public DeleteRedirectURLResponse withDeletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+    public DeleteRedirectURLResponse withDeletedObject(Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = deletedObject;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteRedirectURLResponse other = (DeleteRedirectURLResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.deletedObject, other.deletedObject);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.deletedObject, other.deletedObject);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject = Optional.empty();  
+        private Optional<? extends DeletedObject> deletedObject = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Deleted Object
          */
-        public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+        public Builder deletedObject(DeletedObject deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = Optional.ofNullable(deletedObject);
             return this;
@@ -230,7 +234,7 @@ public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObje
         /**
          * Deleted Object
          */
-        public Builder deletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+        public Builder deletedObject(Optional<? extends DeletedObject> deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = deletedObject;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteSAMLConnectionRequest.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteSAMLConnectionRequest.java
index fc8d2e8..d18b168 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteSAMLConnectionRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteSAMLConnectionRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DeleteSAMLConnectionRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteSAMLConnectionRequest other = (DeleteSAMLConnectionRequest) o;
         return 
-            java.util.Objects.deepEquals(this.samlConnectionId, other.samlConnectionId);
+            Objects.deepEquals(this.samlConnectionId, other.samlConnectionId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             samlConnectionId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteSAMLConnectionRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteSAMLConnectionRequestBuilder.java
index 6c516b3..9e6e473 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteSAMLConnectionRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteSAMLConnectionRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DeleteSAMLConnectionRequestBuilder {
 
@@ -26,7 +16,7 @@ public DeleteSAMLConnectionRequestBuilder(SDKMethodInterfaces.MethodCallDeleteSA
         this.sdk = sdk;
     }
 
-    public DeleteSAMLConnectionRequestBuilder samlConnectionId(String samlConnectionId) {
+    public DeleteSAMLConnectionRequestBuilder samlConnectionId(java.lang.String samlConnectionId) {
         Utils.checkNotNull(samlConnectionId, "samlConnectionId");
         this.samlConnectionId = samlConnectionId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteSAMLConnectionResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteSAMLConnectionResponse.java
index f99ac31..b154a80 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteSAMLConnectionResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteSAMLConnectionResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DeleteSAMLConnectionResponse implements com.clerk.backend_api.utils.Response {
+
+public class DeleteSAMLConnectionResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class DeleteSAMLConnectionResponse implements com.clerk.backend_api.utils
     /**
      * Deleted Object
      */
-    private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject;
+    private Optional<? extends DeletedObject> deletedObject;
 
     @JsonCreator
     public DeleteSAMLConnectionResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+            Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.DeletedObject> deletedObject() {
-        return (Optional<com.clerk.backend_api.models.components.DeletedObject>) deletedObject;
+    public Optional<DeletedObject> deletedObject() {
+        return (Optional<DeletedObject>) deletedObject;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public DeleteSAMLConnectionResponse withRawResponse(HttpResponse<InputStream> ra
     /**
      * Deleted Object
      */
-    public DeleteSAMLConnectionResponse withDeletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+    public DeleteSAMLConnectionResponse withDeletedObject(DeletedObject deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = Optional.ofNullable(deletedObject);
         return this;
@@ -137,7 +141,7 @@ public DeleteSAMLConnectionResponse withDeletedObject(com.clerk.backend_api.mode
     /**
      * Deleted Object
      */
-    public DeleteSAMLConnectionResponse withDeletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+    public DeleteSAMLConnectionResponse withDeletedObject(Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = deletedObject;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteSAMLConnectionResponse other = (DeleteSAMLConnectionResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.deletedObject, other.deletedObject);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.deletedObject, other.deletedObject);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject = Optional.empty();  
+        private Optional<? extends DeletedObject> deletedObject = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Deleted Object
          */
-        public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+        public Builder deletedObject(DeletedObject deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = Optional.ofNullable(deletedObject);
             return this;
@@ -230,7 +234,7 @@ public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObje
         /**
          * Deleted Object
          */
-        public Builder deletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+        public Builder deletedObject(Optional<? extends DeletedObject> deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = deletedObject;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteSvixAppRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteSvixAppRequestBuilder.java
index 75e0f1f..0833c6c 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteSvixAppRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteSvixAppRequestBuilder.java
@@ -4,18 +4,6 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class DeleteSvixAppRequestBuilder {
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteSvixAppResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteSvixAppResponse.java
index 42dd504..50a2cd9 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteSvixAppResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteSvixAppResponse.java
@@ -4,18 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
 import java.net.http.HttpResponse;
+import java.util.Objects;
+
 
-public class DeleteSvixAppResponse implements com.clerk.backend_api.utils.Response {
+public class DeleteSvixAppResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -110,14 +112,14 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteSvixAppResponse other = (DeleteSvixAppResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse);
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteUserProfileImageRequest.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteUserProfileImageRequest.java
index 97dd12e..5b8b29a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteUserProfileImageRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteUserProfileImageRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DeleteUserProfileImageRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteUserProfileImageRequest other = (DeleteUserProfileImageRequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId);
+            Objects.deepEquals(this.userId, other.userId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteUserProfileImageRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteUserProfileImageRequestBuilder.java
index 1649d49..77feff6 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteUserProfileImageRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteUserProfileImageRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DeleteUserProfileImageRequestBuilder {
 
@@ -26,7 +16,7 @@ public DeleteUserProfileImageRequestBuilder(SDKMethodInterfaces.MethodCallDelete
         this.sdk = sdk;
     }
 
-    public DeleteUserProfileImageRequestBuilder userId(String userId) {
+    public DeleteUserProfileImageRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteUserProfileImageResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteUserProfileImageResponse.java
index 449e80f..672fbdc 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteUserProfileImageResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteUserProfileImageResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.User;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DeleteUserProfileImageResponse implements com.clerk.backend_api.utils.Response {
+
+public class DeleteUserProfileImageResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class DeleteUserProfileImageResponse implements com.clerk.backend_api.uti
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.User> user;
+    private Optional<? extends User> user;
 
     @JsonCreator
     public DeleteUserProfileImageResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.User> user) {
+            Optional<? extends User> user) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.User> user() {
-        return (Optional<com.clerk.backend_api.models.components.User>) user;
+    public Optional<User> user() {
+        return (Optional<User>) user;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public DeleteUserProfileImageResponse withRawResponse(HttpResponse<InputStream>
     /**
      * Success
      */
-    public DeleteUserProfileImageResponse withUser(com.clerk.backend_api.models.components.User user) {
+    public DeleteUserProfileImageResponse withUser(User user) {
         Utils.checkNotNull(user, "user");
         this.user = Optional.ofNullable(user);
         return this;
@@ -137,7 +141,7 @@ public DeleteUserProfileImageResponse withUser(com.clerk.backend_api.models.comp
     /**
      * Success
      */
-    public DeleteUserProfileImageResponse withUser(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+    public DeleteUserProfileImageResponse withUser(Optional<? extends User> user) {
         Utils.checkNotNull(user, "user");
         this.user = user;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteUserProfileImageResponse other = (DeleteUserProfileImageResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.user, other.user);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.user, other.user);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.User> user = Optional.empty();  
+        private Optional<? extends User> user = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder user(com.clerk.backend_api.models.components.User user) {
+        public Builder user(User user) {
             Utils.checkNotNull(user, "user");
             this.user = Optional.ofNullable(user);
             return this;
@@ -230,7 +234,7 @@ public Builder user(com.clerk.backend_api.models.components.User user) {
         /**
          * Success
          */
-        public Builder user(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+        public Builder user(Optional<? extends User> user) {
             Utils.checkNotNull(user, "user");
             this.user = user;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteUserRequest.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteUserRequest.java
index b05cb00..f670419 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteUserRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteUserRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DeleteUserRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteUserRequest other = (DeleteUserRequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId);
+            Objects.deepEquals(this.userId, other.userId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteUserRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteUserRequestBuilder.java
index d4ed750..a3ebdb7 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteUserRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteUserRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DeleteUserRequestBuilder {
 
@@ -26,7 +16,7 @@ public DeleteUserRequestBuilder(SDKMethodInterfaces.MethodCallDeleteUser sdk) {
         this.sdk = sdk;
     }
 
-    public DeleteUserRequestBuilder userId(String userId) {
+    public DeleteUserRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DeleteUserResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DeleteUserResponse.java
index 57f80e9..852fe2a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DeleteUserResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DeleteUserResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.DeletedObject;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DeleteUserResponse implements com.clerk.backend_api.utils.Response {
+
+public class DeleteUserResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class DeleteUserResponse implements com.clerk.backend_api.utils.Response
     /**
      * Deleted Object
      */
-    private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject;
+    private Optional<? extends DeletedObject> deletedObject;
 
     @JsonCreator
     public DeleteUserResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+            Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.DeletedObject> deletedObject() {
-        return (Optional<com.clerk.backend_api.models.components.DeletedObject>) deletedObject;
+    public Optional<DeletedObject> deletedObject() {
+        return (Optional<DeletedObject>) deletedObject;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public DeleteUserResponse withRawResponse(HttpResponse<InputStream> rawResponse)
     /**
      * Deleted Object
      */
-    public DeleteUserResponse withDeletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+    public DeleteUserResponse withDeletedObject(DeletedObject deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = Optional.ofNullable(deletedObject);
         return this;
@@ -137,7 +141,7 @@ public DeleteUserResponse withDeletedObject(com.clerk.backend_api.models.compone
     /**
      * Deleted Object
      */
-    public DeleteUserResponse withDeletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+    public DeleteUserResponse withDeletedObject(Optional<? extends DeletedObject> deletedObject) {
         Utils.checkNotNull(deletedObject, "deletedObject");
         this.deletedObject = deletedObject;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         DeleteUserResponse other = (DeleteUserResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.deletedObject, other.deletedObject);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.deletedObject, other.deletedObject);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject = Optional.empty();  
+        private Optional<? extends DeletedObject> deletedObject = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Deleted Object
          */
-        public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObject deletedObject) {
+        public Builder deletedObject(DeletedObject deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = Optional.ofNullable(deletedObject);
             return this;
@@ -230,7 +234,7 @@ public Builder deletedObject(com.clerk.backend_api.models.components.DeletedObje
         /**
          * Deleted Object
          */
-        public Builder deletedObject(Optional<? extends com.clerk.backend_api.models.components.DeletedObject> deletedObject) {
+        public Builder deletedObject(Optional<? extends DeletedObject> deletedObject) {
             Utils.checkNotNull(deletedObject, "deletedObject");
             this.deletedObject = deletedObject;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DisableMFARequest.java b/src/main/java/com/clerk/backend_api/models/operations/DisableMFARequest.java
index 64cf9d8..d2ae716 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DisableMFARequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DisableMFARequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class DisableMFARequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         DisableMFARequest other = (DisableMFARequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId);
+            Objects.deepEquals(this.userId, other.userId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DisableMFARequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/DisableMFARequestBuilder.java
index b0b52c4..262c6b6 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DisableMFARequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DisableMFARequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class DisableMFARequestBuilder {
 
@@ -26,7 +16,7 @@ public DisableMFARequestBuilder(SDKMethodInterfaces.MethodCallDisableMFA sdk) {
         this.sdk = sdk;
     }
 
-    public DisableMFARequestBuilder userId(String userId) {
+    public DisableMFARequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DisableMFAResponse.java b/src/main/java/com/clerk/backend_api/models/operations/DisableMFAResponse.java
index de351e3..8909132 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DisableMFAResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DisableMFAResponse.java
@@ -4,19 +4,22 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class DisableMFAResponse implements com.clerk.backend_api.utils.Response {
+
+public class DisableMFAResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -153,15 +156,15 @@ public boolean equals(java.lang.Object o) {
         }
         DisableMFAResponse other = (DisableMFAResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.object, other.object);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.object, other.object);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
diff --git a/src/main/java/com/clerk/backend_api/models/operations/DisableMFAResponseBody.java b/src/main/java/com/clerk/backend_api/models/operations/DisableMFAResponseBody.java
index 5844451..8a22021 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/DisableMFAResponseBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/DisableMFAResponseBody.java
@@ -4,19 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
+
 /**
  * DisableMFAResponseBody - Successful operation.
  */
@@ -25,11 +24,11 @@ public class DisableMFAResponseBody {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("user_id")
-    private Optional<? extends String> userId;
+    private Optional<String> userId;
 
     @JsonCreator
     public DisableMFAResponseBody(
-            @JsonProperty("user_id") Optional<? extends String> userId) {
+            @JsonProperty("user_id") Optional<String> userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
     }
@@ -38,10 +37,9 @@ public DisableMFAResponseBody() {
         this(Optional.empty());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> userId() {
-        return (Optional<String>) userId;
+        return userId;
     }
 
     public final static Builder builder() {
@@ -54,7 +52,7 @@ public DisableMFAResponseBody withUserId(String userId) {
         return this;
     }
 
-    public DisableMFAResponseBody withUserId(Optional<? extends String> userId) {
+    public DisableMFAResponseBody withUserId(Optional<String> userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
@@ -70,12 +68,12 @@ public boolean equals(java.lang.Object o) {
         }
         DisableMFAResponseBody other = (DisableMFAResponseBody) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId);
+            Objects.deepEquals(this.userId, other.userId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId);
     }
     
@@ -87,7 +85,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> userId = Optional.empty();  
+        private Optional<String> userId = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -99,7 +97,7 @@ public Builder userId(String userId) {
             return this;
         }
 
-        public Builder userId(Optional<? extends String> userId) {
+        public Builder userId(Optional<String> userId) {
             Utils.checkNotNull(userId, "userId");
             this.userId = userId;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/File.java b/src/main/java/com/clerk/backend_api/models/operations/File.java
index 44cf012..5fe2edb 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/File.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/File.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class File {
 
@@ -69,13 +68,13 @@ public boolean equals(java.lang.Object o) {
         }
         File other = (File) o;
         return 
-            java.util.Objects.deepEquals(this.fileName, other.fileName) &&
-            java.util.Objects.deepEquals(this.content, other.content);
+            Objects.deepEquals(this.fileName, other.fileName) &&
+            Objects.deepEquals(this.content, other.content);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             fileName,
             content);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GenerateSvixAuthURLRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GenerateSvixAuthURLRequestBuilder.java
index a874ff8..8ab25b7 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GenerateSvixAuthURLRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GenerateSvixAuthURLRequestBuilder.java
@@ -4,18 +4,6 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class GenerateSvixAuthURLRequestBuilder {
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GenerateSvixAuthURLResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GenerateSvixAuthURLResponse.java
index 3600a84..181573e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GenerateSvixAuthURLResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GenerateSvixAuthURLResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.SvixURL;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GenerateSvixAuthURLResponse implements com.clerk.backend_api.utils.Response {
+
+public class GenerateSvixAuthURLResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GenerateSvixAuthURLResponse implements com.clerk.backend_api.utils.
     /**
      * Response that contains a temporary Svix URL to access management dashboard
      */
-    private Optional<? extends com.clerk.backend_api.models.components.SvixURL> svixURL;
+    private Optional<? extends SvixURL> svixURL;
 
     @JsonCreator
     public GenerateSvixAuthURLResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.SvixURL> svixURL) {
+            Optional<? extends SvixURL> svixURL) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.SvixURL> svixURL() {
-        return (Optional<com.clerk.backend_api.models.components.SvixURL>) svixURL;
+    public Optional<SvixURL> svixURL() {
+        return (Optional<SvixURL>) svixURL;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GenerateSvixAuthURLResponse withRawResponse(HttpResponse<InputStream> raw
     /**
      * Response that contains a temporary Svix URL to access management dashboard
      */
-    public GenerateSvixAuthURLResponse withSvixURL(com.clerk.backend_api.models.components.SvixURL svixURL) {
+    public GenerateSvixAuthURLResponse withSvixURL(SvixURL svixURL) {
         Utils.checkNotNull(svixURL, "svixURL");
         this.svixURL = Optional.ofNullable(svixURL);
         return this;
@@ -137,7 +141,7 @@ public GenerateSvixAuthURLResponse withSvixURL(com.clerk.backend_api.models.comp
     /**
      * Response that contains a temporary Svix URL to access management dashboard
      */
-    public GenerateSvixAuthURLResponse withSvixURL(Optional<? extends com.clerk.backend_api.models.components.SvixURL> svixURL) {
+    public GenerateSvixAuthURLResponse withSvixURL(Optional<? extends SvixURL> svixURL) {
         Utils.checkNotNull(svixURL, "svixURL");
         this.svixURL = svixURL;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GenerateSvixAuthURLResponse other = (GenerateSvixAuthURLResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.svixURL, other.svixURL);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.svixURL, other.svixURL);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.SvixURL> svixURL = Optional.empty();  
+        private Optional<? extends SvixURL> svixURL = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Response that contains a temporary Svix URL to access management dashboard
          */
-        public Builder svixURL(com.clerk.backend_api.models.components.SvixURL svixURL) {
+        public Builder svixURL(SvixURL svixURL) {
             Utils.checkNotNull(svixURL, "svixURL");
             this.svixURL = Optional.ofNullable(svixURL);
             return this;
@@ -230,7 +234,7 @@ public Builder svixURL(com.clerk.backend_api.models.components.SvixURL svixURL)
         /**
          * Response that contains a temporary Svix URL to access management dashboard
          */
-        public Builder svixURL(Optional<? extends com.clerk.backend_api.models.components.SvixURL> svixURL) {
+        public Builder svixURL(Optional<? extends SvixURL> svixURL) {
             Utils.checkNotNull(svixURL, "svixURL");
             this.svixURL = svixURL;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetClientListRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetClientListRequest.java
index 8e7071e..ec78d30 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetClientListRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetClientListRequest.java
@@ -4,19 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class GetClientListRequest {
 
     /**
@@ -24,7 +25,7 @@ public class GetClientListRequest {
      * Can be used for paginating the results together with `offset`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=limit")
-    private Optional<? extends Long> limit;
+    private Optional<Long> limit;
 
     /**
      * Skip the first `offset` results when paginating.
@@ -32,12 +33,12 @@ public class GetClientListRequest {
      * To be used in conjunction with `limit`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=offset")
-    private Optional<? extends Long> offset;
+    private Optional<Long> offset;
 
     @JsonCreator
     public GetClientListRequest(
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) {
+            Optional<Long> limit,
+            Optional<Long> offset) {
         Utils.checkNotNull(limit, "limit");
         Utils.checkNotNull(offset, "offset");
         this.limit = limit;
@@ -52,10 +53,9 @@ public GetClientListRequest() {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> limit() {
-        return (Optional<Long>) limit;
+        return limit;
     }
 
     /**
@@ -63,10 +63,9 @@ public Optional<Long> limit() {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> offset() {
-        return (Optional<Long>) offset;
+        return offset;
     }
 
     public final static Builder builder() {
@@ -87,7 +86,7 @@ public GetClientListRequest withLimit(long limit) {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    public GetClientListRequest withLimit(Optional<? extends Long> limit) {
+    public GetClientListRequest withLimit(Optional<Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -109,7 +108,7 @@ public GetClientListRequest withOffset(long offset) {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    public GetClientListRequest withOffset(Optional<? extends Long> offset) {
+    public GetClientListRequest withOffset(Optional<Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -125,13 +124,13 @@ public boolean equals(java.lang.Object o) {
         }
         GetClientListRequest other = (GetClientListRequest) o;
         return 
-            java.util.Objects.deepEquals(this.limit, other.limit) &&
-            java.util.Objects.deepEquals(this.offset, other.offset);
+            Objects.deepEquals(this.limit, other.limit) &&
+            Objects.deepEquals(this.offset, other.offset);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             limit,
             offset);
     }
@@ -145,9 +144,9 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends Long> limit;
+        private Optional<Long> limit;
  
-        private Optional<? extends Long> offset;  
+        private Optional<Long> offset;  
         
         private Builder() {
           // force use of static builder() method
@@ -167,7 +166,7 @@ public Builder limit(long limit) {
          * Applies a limit to the number of results returned.
          * Can be used for paginating the results together with `offset`.
          */
-        public Builder limit(Optional<? extends Long> limit) {
+        public Builder limit(Optional<Long> limit) {
             Utils.checkNotNull(limit, "limit");
             this.limit = limit;
             return this;
@@ -189,7 +188,7 @@ public Builder offset(long offset) {
          * Needs to be an integer greater or equal to zero.
          * To be used in conjunction with `limit`.
          */
-        public Builder offset(Optional<? extends Long> offset) {
+        public Builder offset(Optional<Long> offset) {
             Utils.checkNotNull(offset, "offset");
             this.offset = offset;
             return this;
@@ -207,17 +206,17 @@ public GetClientListRequest build() {
                 offset);
         }
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
                 new LazySingletonValue<>(
                         "limit",
                         "10",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
                 new LazySingletonValue<>(
                         "offset",
                         "0",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetClientListRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetClientListRequestBuilder.java
index 455f5f1..43cb311 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetClientListRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetClientListRequestBuilder.java
@@ -8,25 +8,20 @@
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.Long;
 import java.util.Optional;
 import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class GetClientListRequestBuilder {
 
-    private Optional<? extends Long> limit = Utils.readDefaultOrConstValue(
+    private Optional<Long> limit = Utils.readDefaultOrConstValue(
                             "limit",
                             "10",
-                            new TypeReference<Optional<? extends Long>>() {});
-    private Optional<? extends Long> offset = Utils.readDefaultOrConstValue(
+                            new TypeReference<Optional<Long>>() {});
+    private Optional<Long> offset = Utils.readDefaultOrConstValue(
                             "offset",
                             "0",
-                            new TypeReference<Optional<? extends Long>>() {});
+                            new TypeReference<Optional<Long>>() {});
     private final SDKMethodInterfaces.MethodCallGetClientList sdk;
 
     public GetClientListRequestBuilder(SDKMethodInterfaces.MethodCallGetClientList sdk) {
@@ -39,7 +34,7 @@ public GetClientListRequestBuilder limit(long limit) {
         return this;
     }
 
-    public GetClientListRequestBuilder limit(Optional<? extends Long> limit) {
+    public GetClientListRequestBuilder limit(java.util.Optional<java.lang.Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -51,7 +46,7 @@ public GetClientListRequestBuilder offset(long offset) {
         return this;
     }
 
-    public GetClientListRequestBuilder offset(Optional<? extends Long> offset) {
+    public GetClientListRequestBuilder offset(java.util.Optional<java.lang.Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -91,15 +86,15 @@ public Stream<GetClientListResponse> callAsStream() {
         });
     }
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
             new LazySingletonValue<>(
                     "limit",
                     "10",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
             new LazySingletonValue<>(
                     "offset",
                     "0",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetClientListResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetClientListResponse.java
index e1d40b6..8e358b4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetClientListResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetClientListResponse.java
@@ -4,20 +4,27 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Client;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
 import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 
-public class GetClientListResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetClientListResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -37,7 +44,7 @@ public class GetClientListResponse implements com.clerk.backend_api.utils.Respon
     /**
      * Success
      */
-    private Optional<? extends java.util.List<com.clerk.backend_api.models.components.Client>> clientList;
+    private Optional<? extends List<Client>> clientList;
 
     private Callable<Optional<GetClientListResponse>> next = () -> Optional.empty();
 
@@ -46,7 +53,7 @@ public GetClientListResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends java.util.List<com.clerk.backend_api.models.components.Client>> clientList) {
+            Optional<? extends List<Client>> clientList) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -93,8 +100,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<com.clerk.backend_api.models.components.Client>> clientList() {
-        return (Optional<java.util.List<com.clerk.backend_api.models.components.Client>>) clientList;
+    public Optional<List<Client>> clientList() {
+        return (Optional<List<Client>>) clientList;
     }
 
     public Optional<GetClientListResponse> next() throws Exception {
@@ -141,7 +148,7 @@ public GetClientListResponse withRawResponse(HttpResponse<InputStream> rawRespon
     /**
      * Success
      */
-    public GetClientListResponse withClientList(java.util.List<com.clerk.backend_api.models.components.Client> clientList) {
+    public GetClientListResponse withClientList(List<Client> clientList) {
         Utils.checkNotNull(clientList, "clientList");
         this.clientList = Optional.ofNullable(clientList);
         return this;
@@ -150,7 +157,7 @@ public GetClientListResponse withClientList(java.util.List<com.clerk.backend_api
     /**
      * Success
      */
-    public GetClientListResponse withClientList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.Client>> clientList) {
+    public GetClientListResponse withClientList(Optional<? extends List<Client>> clientList) {
         Utils.checkNotNull(clientList, "clientList");
         this.clientList = clientList;
         return this;
@@ -166,15 +173,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetClientListResponse other = (GetClientListResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.clientList, other.clientList);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.clientList, other.clientList);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -199,7 +206,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends java.util.List<com.clerk.backend_api.models.components.Client>> clientList = Optional.empty();  
+        private Optional<? extends List<Client>> clientList = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -235,7 +242,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder clientList(java.util.List<com.clerk.backend_api.models.components.Client> clientList) {
+        public Builder clientList(List<Client> clientList) {
             Utils.checkNotNull(clientList, "clientList");
             this.clientList = Optional.ofNullable(clientList);
             return this;
@@ -244,7 +251,7 @@ public Builder clientList(java.util.List<com.clerk.backend_api.models.components
         /**
          * Success
          */
-        public Builder clientList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.Client>> clientList) {
+        public Builder clientList(Optional<? extends List<Client>> clientList) {
             Utils.checkNotNull(clientList, "clientList");
             this.clientList = clientList;
             return this;
@@ -253,7 +260,7 @@ public Builder clientList(Optional<? extends java.util.List<com.clerk.backend_ap
         /**
          * Internal API. Not for public use. Sets the provider of the next page.
          *
-         * @deprecated not part of the public API, may be removed without notice
+         * @Deprecated not part of the public API, may be removed without notice
          */
         @Deprecated
         public Builder next(Callable<Optional<GetClientListResponse>> next) {
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetClientRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetClientRequest.java
index a4e3573..1bae52f 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetClientRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetClientRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetClientRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         GetClientRequest other = (GetClientRequest) o;
         return 
-            java.util.Objects.deepEquals(this.clientId, other.clientId);
+            Objects.deepEquals(this.clientId, other.clientId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             clientId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetClientRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetClientRequestBuilder.java
index e32fba1..4acd33b 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetClientRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetClientRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class GetClientRequestBuilder {
 
@@ -26,7 +16,7 @@ public GetClientRequestBuilder(SDKMethodInterfaces.MethodCallGetClient sdk) {
         this.sdk = sdk;
     }
 
-    public GetClientRequestBuilder clientId(String clientId) {
+    public GetClientRequestBuilder clientId(java.lang.String clientId) {
         Utils.checkNotNull(clientId, "clientId");
         this.clientId = clientId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetClientResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetClientResponse.java
index af4952d..73ff647 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetClientResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetClientResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Client;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetClientResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetClientResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GetClientResponse implements com.clerk.backend_api.utils.Response {
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Client> client;
+    private Optional<? extends Client> client;
 
     @JsonCreator
     public GetClientResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Client> client) {
+            Optional<? extends Client> client) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Client> client() {
-        return (Optional<com.clerk.backend_api.models.components.Client>) client;
+    public Optional<Client> client() {
+        return (Optional<Client>) client;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GetClientResponse withRawResponse(HttpResponse<InputStream> rawResponse)
     /**
      * Success
      */
-    public GetClientResponse withClient(com.clerk.backend_api.models.components.Client client) {
+    public GetClientResponse withClient(Client client) {
         Utils.checkNotNull(client, "client");
         this.client = Optional.ofNullable(client);
         return this;
@@ -137,7 +141,7 @@ public GetClientResponse withClient(com.clerk.backend_api.models.components.Clie
     /**
      * Success
      */
-    public GetClientResponse withClient(Optional<? extends com.clerk.backend_api.models.components.Client> client) {
+    public GetClientResponse withClient(Optional<? extends Client> client) {
         Utils.checkNotNull(client, "client");
         this.client = client;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetClientResponse other = (GetClientResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.client, other.client);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.client, other.client);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Client> client = Optional.empty();  
+        private Optional<? extends Client> client = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder client(com.clerk.backend_api.models.components.Client client) {
+        public Builder client(Client client) {
             Utils.checkNotNull(client, "client");
             this.client = Optional.ofNullable(client);
             return this;
@@ -230,7 +234,7 @@ public Builder client(com.clerk.backend_api.models.components.Client client) {
         /**
          * Success
          */
-        public Builder client(Optional<? extends com.clerk.backend_api.models.components.Client> client) {
+        public Builder client(Optional<? extends Client> client) {
             Utils.checkNotNull(client, "client");
             this.client = client;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetEmailAddressRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetEmailAddressRequest.java
index c5156d7..0378b35 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetEmailAddressRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetEmailAddressRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetEmailAddressRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         GetEmailAddressRequest other = (GetEmailAddressRequest) o;
         return 
-            java.util.Objects.deepEquals(this.emailAddressId, other.emailAddressId);
+            Objects.deepEquals(this.emailAddressId, other.emailAddressId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             emailAddressId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetEmailAddressRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetEmailAddressRequestBuilder.java
index 8c29551..f2ae8a4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetEmailAddressRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetEmailAddressRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class GetEmailAddressRequestBuilder {
 
@@ -26,7 +16,7 @@ public GetEmailAddressRequestBuilder(SDKMethodInterfaces.MethodCallGetEmailAddre
         this.sdk = sdk;
     }
 
-    public GetEmailAddressRequestBuilder emailAddressId(String emailAddressId) {
+    public GetEmailAddressRequestBuilder emailAddressId(java.lang.String emailAddressId) {
         Utils.checkNotNull(emailAddressId, "emailAddressId");
         this.emailAddressId = emailAddressId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetEmailAddressResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetEmailAddressResponse.java
index 6403e28..9dd1a7c 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetEmailAddressResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetEmailAddressResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.EmailAddress;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetEmailAddressResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetEmailAddressResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GetEmailAddressResponse implements com.clerk.backend_api.utils.Resp
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress;
+    private Optional<? extends EmailAddress> emailAddress;
 
     @JsonCreator
     public GetEmailAddressResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress) {
+            Optional<? extends EmailAddress> emailAddress) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.EmailAddress> emailAddress() {
-        return (Optional<com.clerk.backend_api.models.components.EmailAddress>) emailAddress;
+    public Optional<EmailAddress> emailAddress() {
+        return (Optional<EmailAddress>) emailAddress;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GetEmailAddressResponse withRawResponse(HttpResponse<InputStream> rawResp
     /**
      * Success
      */
-    public GetEmailAddressResponse withEmailAddress(com.clerk.backend_api.models.components.EmailAddress emailAddress) {
+    public GetEmailAddressResponse withEmailAddress(EmailAddress emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = Optional.ofNullable(emailAddress);
         return this;
@@ -137,7 +141,7 @@ public GetEmailAddressResponse withEmailAddress(com.clerk.backend_api.models.com
     /**
      * Success
      */
-    public GetEmailAddressResponse withEmailAddress(Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress) {
+    public GetEmailAddressResponse withEmailAddress(Optional<? extends EmailAddress> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = emailAddress;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetEmailAddressResponse other = (GetEmailAddressResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.emailAddress, other.emailAddress);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress = Optional.empty();  
+        private Optional<? extends EmailAddress> emailAddress = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder emailAddress(com.clerk.backend_api.models.components.EmailAddress emailAddress) {
+        public Builder emailAddress(EmailAddress emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = Optional.ofNullable(emailAddress);
             return this;
@@ -230,7 +234,7 @@ public Builder emailAddress(com.clerk.backend_api.models.components.EmailAddress
         /**
          * Success
          */
-        public Builder emailAddress(Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress) {
+        public Builder emailAddress(Optional<? extends EmailAddress> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = emailAddress;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetJWKSRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetJWKSRequestBuilder.java
index 22e233f..f72dc00 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetJWKSRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetJWKSRequestBuilder.java
@@ -4,18 +4,6 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class GetJWKSRequestBuilder {
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetJWKSResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetJWKSResponse.java
index a342668..22bb14a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetJWKSResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetJWKSResponse.java
@@ -4,18 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
 import java.net.http.HttpResponse;
+import java.util.Objects;
+
 
-public class GetJWKSResponse implements com.clerk.backend_api.utils.Response {
+public class GetJWKSResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -110,14 +112,14 @@ public boolean equals(java.lang.Object o) {
         }
         GetJWKSResponse other = (GetJWKSResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse);
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetJWTTemplateRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetJWTTemplateRequest.java
index d132d74..4b70e61 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetJWTTemplateRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetJWTTemplateRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetJWTTemplateRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         GetJWTTemplateRequest other = (GetJWTTemplateRequest) o;
         return 
-            java.util.Objects.deepEquals(this.templateId, other.templateId);
+            Objects.deepEquals(this.templateId, other.templateId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             templateId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetJWTTemplateRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetJWTTemplateRequestBuilder.java
index 44e8632..97cd513 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetJWTTemplateRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetJWTTemplateRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class GetJWTTemplateRequestBuilder {
 
@@ -26,7 +16,7 @@ public GetJWTTemplateRequestBuilder(SDKMethodInterfaces.MethodCallGetJWTTemplate
         this.sdk = sdk;
     }
 
-    public GetJWTTemplateRequestBuilder templateId(String templateId) {
+    public GetJWTTemplateRequestBuilder templateId(java.lang.String templateId) {
         Utils.checkNotNull(templateId, "templateId");
         this.templateId = templateId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetJWTTemplateResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetJWTTemplateResponse.java
index 12b5728..c1957c3 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetJWTTemplateResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetJWTTemplateResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.JWTTemplate;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetJWTTemplateResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetJWTTemplateResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GetJWTTemplateResponse implements com.clerk.backend_api.utils.Respo
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate;
+    private Optional<? extends JWTTemplate> jwtTemplate;
 
     @JsonCreator
     public GetJWTTemplateResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate) {
+            Optional<? extends JWTTemplate> jwtTemplate) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate() {
-        return (Optional<com.clerk.backend_api.models.components.JWTTemplate>) jwtTemplate;
+    public Optional<JWTTemplate> jwtTemplate() {
+        return (Optional<JWTTemplate>) jwtTemplate;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GetJWTTemplateResponse withRawResponse(HttpResponse<InputStream> rawRespo
     /**
      * Success
      */
-    public GetJWTTemplateResponse withJWTTemplate(com.clerk.backend_api.models.components.JWTTemplate jwtTemplate) {
+    public GetJWTTemplateResponse withJWTTemplate(JWTTemplate jwtTemplate) {
         Utils.checkNotNull(jwtTemplate, "jwtTemplate");
         this.jwtTemplate = Optional.ofNullable(jwtTemplate);
         return this;
@@ -137,7 +141,7 @@ public GetJWTTemplateResponse withJWTTemplate(com.clerk.backend_api.models.compo
     /**
      * Success
      */
-    public GetJWTTemplateResponse withJWTTemplate(Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate) {
+    public GetJWTTemplateResponse withJWTTemplate(Optional<? extends JWTTemplate> jwtTemplate) {
         Utils.checkNotNull(jwtTemplate, "jwtTemplate");
         this.jwtTemplate = jwtTemplate;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetJWTTemplateResponse other = (GetJWTTemplateResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.jwtTemplate, other.jwtTemplate);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.jwtTemplate, other.jwtTemplate);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate = Optional.empty();  
+        private Optional<? extends JWTTemplate> jwtTemplate = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder jwtTemplate(com.clerk.backend_api.models.components.JWTTemplate jwtTemplate) {
+        public Builder jwtTemplate(JWTTemplate jwtTemplate) {
             Utils.checkNotNull(jwtTemplate, "jwtTemplate");
             this.jwtTemplate = Optional.ofNullable(jwtTemplate);
             return this;
@@ -230,7 +234,7 @@ public Builder jwtTemplate(com.clerk.backend_api.models.components.JWTTemplate j
         /**
          * Success
          */
-        public Builder jwtTemplate(Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate) {
+        public Builder jwtTemplate(Optional<? extends JWTTemplate> jwtTemplate) {
             Utils.checkNotNull(jwtTemplate, "jwtTemplate");
             this.jwtTemplate = jwtTemplate;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenPublicMetadata.java
index 0e5cc20..f05c431 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetOAuthAccessTokenPublicMetadata {
 
@@ -39,7 +37,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenRequest.java
index 45ed182..98c799f 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetOAuthAccessTokenRequest {
 
@@ -87,13 +86,13 @@ public boolean equals(java.lang.Object o) {
         }
         GetOAuthAccessTokenRequest other = (GetOAuthAccessTokenRequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.provider, other.provider);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.provider, other.provider);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             provider);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenRequestBuilder.java
index e26da48..970b900 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class GetOAuthAccessTokenRequestBuilder {
 
@@ -27,13 +17,13 @@ public GetOAuthAccessTokenRequestBuilder(SDKMethodInterfaces.MethodCallGetOAuthA
         this.sdk = sdk;
     }
 
-    public GetOAuthAccessTokenRequestBuilder userId(String userId) {
+    public GetOAuthAccessTokenRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
     }
 
-    public GetOAuthAccessTokenRequestBuilder provider(String provider) {
+    public GetOAuthAccessTokenRequestBuilder provider(java.lang.String provider) {
         Utils.checkNotNull(provider, "provider");
         this.provider = provider;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenResponse.java
index b66664c..1d54c9c 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetOAuthAccessTokenResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetOAuthAccessTokenResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetOAuthAccessTokenResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GetOAuthAccessTokenResponse implements com.clerk.backend_api.utils.
     /**
      * The OAuth access token of the user, if any.
      */
-    private Optional<? extends java.util.List<ResponseBody>> responseBodies;
+    private Optional<? extends List<ResponseBody>> responseBodies;
 
     @JsonCreator
     public GetOAuthAccessTokenResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends java.util.List<ResponseBody>> responseBodies) {
+            Optional<? extends List<ResponseBody>> responseBodies) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<ResponseBody>> responseBodies() {
-        return (Optional<java.util.List<ResponseBody>>) responseBodies;
+    public Optional<List<ResponseBody>> responseBodies() {
+        return (Optional<List<ResponseBody>>) responseBodies;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GetOAuthAccessTokenResponse withRawResponse(HttpResponse<InputStream> raw
     /**
      * The OAuth access token of the user, if any.
      */
-    public GetOAuthAccessTokenResponse withResponseBodies(java.util.List<ResponseBody> responseBodies) {
+    public GetOAuthAccessTokenResponse withResponseBodies(List<ResponseBody> responseBodies) {
         Utils.checkNotNull(responseBodies, "responseBodies");
         this.responseBodies = Optional.ofNullable(responseBodies);
         return this;
@@ -137,7 +141,7 @@ public GetOAuthAccessTokenResponse withResponseBodies(java.util.List<ResponseBod
     /**
      * The OAuth access token of the user, if any.
      */
-    public GetOAuthAccessTokenResponse withResponseBodies(Optional<? extends java.util.List<ResponseBody>> responseBodies) {
+    public GetOAuthAccessTokenResponse withResponseBodies(Optional<? extends List<ResponseBody>> responseBodies) {
         Utils.checkNotNull(responseBodies, "responseBodies");
         this.responseBodies = responseBodies;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetOAuthAccessTokenResponse other = (GetOAuthAccessTokenResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.responseBodies, other.responseBodies);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.responseBodies, other.responseBodies);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends java.util.List<ResponseBody>> responseBodies = Optional.empty();  
+        private Optional<? extends List<ResponseBody>> responseBodies = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * The OAuth access token of the user, if any.
          */
-        public Builder responseBodies(java.util.List<ResponseBody> responseBodies) {
+        public Builder responseBodies(List<ResponseBody> responseBodies) {
             Utils.checkNotNull(responseBodies, "responseBodies");
             this.responseBodies = Optional.ofNullable(responseBodies);
             return this;
@@ -230,7 +234,7 @@ public Builder responseBodies(java.util.List<ResponseBody> responseBodies) {
         /**
          * The OAuth access token of the user, if any.
          */
-        public Builder responseBodies(Optional<? extends java.util.List<ResponseBody>> responseBodies) {
+        public Builder responseBodies(Optional<? extends List<ResponseBody>> responseBodies) {
             Utils.checkNotNull(responseBodies, "responseBodies");
             this.responseBodies = responseBodies;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetOAuthApplicationRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetOAuthApplicationRequest.java
index 09e1394..d7fa75b 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetOAuthApplicationRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetOAuthApplicationRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetOAuthApplicationRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         GetOAuthApplicationRequest other = (GetOAuthApplicationRequest) o;
         return 
-            java.util.Objects.deepEquals(this.oauthApplicationId, other.oauthApplicationId);
+            Objects.deepEquals(this.oauthApplicationId, other.oauthApplicationId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             oauthApplicationId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetOAuthApplicationRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetOAuthApplicationRequestBuilder.java
index cf5dcd4..750266c 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetOAuthApplicationRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetOAuthApplicationRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class GetOAuthApplicationRequestBuilder {
 
@@ -26,7 +16,7 @@ public GetOAuthApplicationRequestBuilder(SDKMethodInterfaces.MethodCallGetOAuthA
         this.sdk = sdk;
     }
 
-    public GetOAuthApplicationRequestBuilder oauthApplicationId(String oauthApplicationId) {
+    public GetOAuthApplicationRequestBuilder oauthApplicationId(java.lang.String oauthApplicationId) {
         Utils.checkNotNull(oauthApplicationId, "oauthApplicationId");
         this.oauthApplicationId = oauthApplicationId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetOAuthApplicationResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetOAuthApplicationResponse.java
index 2770b2f..4ecb30d 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetOAuthApplicationResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetOAuthApplicationResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OAuthApplication;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetOAuthApplicationResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetOAuthApplicationResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GetOAuthApplicationResponse implements com.clerk.backend_api.utils.
     /**
      * An OAuth application
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OAuthApplication> oAuthApplication;
+    private Optional<? extends OAuthApplication> oAuthApplication;
 
     @JsonCreator
     public GetOAuthApplicationResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OAuthApplication> oAuthApplication) {
+            Optional<? extends OAuthApplication> oAuthApplication) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OAuthApplication> oAuthApplication() {
-        return (Optional<com.clerk.backend_api.models.components.OAuthApplication>) oAuthApplication;
+    public Optional<OAuthApplication> oAuthApplication() {
+        return (Optional<OAuthApplication>) oAuthApplication;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GetOAuthApplicationResponse withRawResponse(HttpResponse<InputStream> raw
     /**
      * An OAuth application
      */
-    public GetOAuthApplicationResponse withOAuthApplication(com.clerk.backend_api.models.components.OAuthApplication oAuthApplication) {
+    public GetOAuthApplicationResponse withOAuthApplication(OAuthApplication oAuthApplication) {
         Utils.checkNotNull(oAuthApplication, "oAuthApplication");
         this.oAuthApplication = Optional.ofNullable(oAuthApplication);
         return this;
@@ -137,7 +141,7 @@ public GetOAuthApplicationResponse withOAuthApplication(com.clerk.backend_api.mo
     /**
      * An OAuth application
      */
-    public GetOAuthApplicationResponse withOAuthApplication(Optional<? extends com.clerk.backend_api.models.components.OAuthApplication> oAuthApplication) {
+    public GetOAuthApplicationResponse withOAuthApplication(Optional<? extends OAuthApplication> oAuthApplication) {
         Utils.checkNotNull(oAuthApplication, "oAuthApplication");
         this.oAuthApplication = oAuthApplication;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetOAuthApplicationResponse other = (GetOAuthApplicationResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.oAuthApplication, other.oAuthApplication);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.oAuthApplication, other.oAuthApplication);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OAuthApplication> oAuthApplication = Optional.empty();  
+        private Optional<? extends OAuthApplication> oAuthApplication = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * An OAuth application
          */
-        public Builder oAuthApplication(com.clerk.backend_api.models.components.OAuthApplication oAuthApplication) {
+        public Builder oAuthApplication(OAuthApplication oAuthApplication) {
             Utils.checkNotNull(oAuthApplication, "oAuthApplication");
             this.oAuthApplication = Optional.ofNullable(oAuthApplication);
             return this;
@@ -230,7 +234,7 @@ public Builder oAuthApplication(com.clerk.backend_api.models.components.OAuthApp
         /**
          * An OAuth application
          */
-        public Builder oAuthApplication(Optional<? extends com.clerk.backend_api.models.components.OAuthApplication> oAuthApplication) {
+        public Builder oAuthApplication(Optional<? extends OAuthApplication> oAuthApplication) {
             Utils.checkNotNull(oAuthApplication, "oAuthApplication");
             this.oAuthApplication = oAuthApplication;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationInvitationRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationInvitationRequest.java
index fa1aab4..a0eb513 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationInvitationRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationInvitationRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetOrganizationInvitationRequest {
 
@@ -87,13 +86,13 @@ public boolean equals(java.lang.Object o) {
         }
         GetOrganizationInvitationRequest other = (GetOrganizationInvitationRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.invitationId, other.invitationId);
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.invitationId, other.invitationId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId,
             invitationId);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationInvitationRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationInvitationRequestBuilder.java
index f988af3..08b9ef6 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationInvitationRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationInvitationRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class GetOrganizationInvitationRequestBuilder {
 
@@ -27,13 +17,13 @@ public GetOrganizationInvitationRequestBuilder(SDKMethodInterfaces.MethodCallGet
         this.sdk = sdk;
     }
 
-    public GetOrganizationInvitationRequestBuilder organizationId(String organizationId) {
+    public GetOrganizationInvitationRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
     }
 
-    public GetOrganizationInvitationRequestBuilder invitationId(String invitationId) {
+    public GetOrganizationInvitationRequestBuilder invitationId(java.lang.String invitationId) {
         Utils.checkNotNull(invitationId, "invitationId");
         this.invitationId = invitationId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationInvitationResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationInvitationResponse.java
index dabcf7e..b5afd81 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationInvitationResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationInvitationResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OrganizationInvitation;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetOrganizationInvitationResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetOrganizationInvitationResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GetOrganizationInvitationResponse implements com.clerk.backend_api.
     /**
      * An organization invitation
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation;
+    private Optional<? extends OrganizationInvitation> organizationInvitation;
 
     @JsonCreator
     public GetOrganizationInvitationResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation) {
+            Optional<? extends OrganizationInvitation> organizationInvitation) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation() {
-        return (Optional<com.clerk.backend_api.models.components.OrganizationInvitation>) organizationInvitation;
+    public Optional<OrganizationInvitation> organizationInvitation() {
+        return (Optional<OrganizationInvitation>) organizationInvitation;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GetOrganizationInvitationResponse withRawResponse(HttpResponse<InputStrea
     /**
      * An organization invitation
      */
-    public GetOrganizationInvitationResponse withOrganizationInvitation(com.clerk.backend_api.models.components.OrganizationInvitation organizationInvitation) {
+    public GetOrganizationInvitationResponse withOrganizationInvitation(OrganizationInvitation organizationInvitation) {
         Utils.checkNotNull(organizationInvitation, "organizationInvitation");
         this.organizationInvitation = Optional.ofNullable(organizationInvitation);
         return this;
@@ -137,7 +141,7 @@ public GetOrganizationInvitationResponse withOrganizationInvitation(com.clerk.ba
     /**
      * An organization invitation
      */
-    public GetOrganizationInvitationResponse withOrganizationInvitation(Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation) {
+    public GetOrganizationInvitationResponse withOrganizationInvitation(Optional<? extends OrganizationInvitation> organizationInvitation) {
         Utils.checkNotNull(organizationInvitation, "organizationInvitation");
         this.organizationInvitation = organizationInvitation;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetOrganizationInvitationResponse other = (GetOrganizationInvitationResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizationInvitation, other.organizationInvitation);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizationInvitation, other.organizationInvitation);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation = Optional.empty();  
+        private Optional<? extends OrganizationInvitation> organizationInvitation = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * An organization invitation
          */
-        public Builder organizationInvitation(com.clerk.backend_api.models.components.OrganizationInvitation organizationInvitation) {
+        public Builder organizationInvitation(OrganizationInvitation organizationInvitation) {
             Utils.checkNotNull(organizationInvitation, "organizationInvitation");
             this.organizationInvitation = Optional.ofNullable(organizationInvitation);
             return this;
@@ -230,7 +234,7 @@ public Builder organizationInvitation(com.clerk.backend_api.models.components.Or
         /**
          * An organization invitation
          */
-        public Builder organizationInvitation(Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation) {
+        public Builder organizationInvitation(Optional<? extends OrganizationInvitation> organizationInvitation) {
             Utils.checkNotNull(organizationInvitation, "organizationInvitation");
             this.organizationInvitation = organizationInvitation;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationRequest.java
index 553ef39..61c73aa 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetOrganizationRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         GetOrganizationRequest other = (GetOrganizationRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId);
+            Objects.deepEquals(this.organizationId, other.organizationId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationRequestBuilder.java
index 834f7b1..e4f4506 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class GetOrganizationRequestBuilder {
 
@@ -26,7 +16,7 @@ public GetOrganizationRequestBuilder(SDKMethodInterfaces.MethodCallGetOrganizati
         this.sdk = sdk;
     }
 
-    public GetOrganizationRequestBuilder organizationId(String organizationId) {
+    public GetOrganizationRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationResponse.java
index e758e40..32d5f6a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetOrganizationResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Organization;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetOrganizationResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetOrganizationResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GetOrganizationResponse implements com.clerk.backend_api.utils.Resp
     /**
      * An organization
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Organization> organization;
+    private Optional<? extends Organization> organization;
 
     @JsonCreator
     public GetOrganizationResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+            Optional<? extends Organization> organization) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Organization> organization() {
-        return (Optional<com.clerk.backend_api.models.components.Organization>) organization;
+    public Optional<Organization> organization() {
+        return (Optional<Organization>) organization;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GetOrganizationResponse withRawResponse(HttpResponse<InputStream> rawResp
     /**
      * An organization
      */
-    public GetOrganizationResponse withOrganization(com.clerk.backend_api.models.components.Organization organization) {
+    public GetOrganizationResponse withOrganization(Organization organization) {
         Utils.checkNotNull(organization, "organization");
         this.organization = Optional.ofNullable(organization);
         return this;
@@ -137,7 +141,7 @@ public GetOrganizationResponse withOrganization(com.clerk.backend_api.models.com
     /**
      * An organization
      */
-    public GetOrganizationResponse withOrganization(Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+    public GetOrganizationResponse withOrganization(Optional<? extends Organization> organization) {
         Utils.checkNotNull(organization, "organization");
         this.organization = organization;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetOrganizationResponse other = (GetOrganizationResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organization, other.organization);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organization, other.organization);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Organization> organization = Optional.empty();  
+        private Optional<? extends Organization> organization = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * An organization
          */
-        public Builder organization(com.clerk.backend_api.models.components.Organization organization) {
+        public Builder organization(Organization organization) {
             Utils.checkNotNull(organization, "organization");
             this.organization = Optional.ofNullable(organization);
             return this;
@@ -230,7 +234,7 @@ public Builder organization(com.clerk.backend_api.models.components.Organization
         /**
          * An organization
          */
-        public Builder organization(Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+        public Builder organization(Optional<? extends Organization> organization) {
             Utils.checkNotNull(organization, "organization");
             this.organization = organization;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetPhoneNumberRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetPhoneNumberRequest.java
index 2d1f49d..a0dd984 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetPhoneNumberRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetPhoneNumberRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetPhoneNumberRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         GetPhoneNumberRequest other = (GetPhoneNumberRequest) o;
         return 
-            java.util.Objects.deepEquals(this.phoneNumberId, other.phoneNumberId);
+            Objects.deepEquals(this.phoneNumberId, other.phoneNumberId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             phoneNumberId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetPhoneNumberRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetPhoneNumberRequestBuilder.java
index 6862200..e54519e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetPhoneNumberRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetPhoneNumberRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class GetPhoneNumberRequestBuilder {
 
@@ -26,7 +16,7 @@ public GetPhoneNumberRequestBuilder(SDKMethodInterfaces.MethodCallGetPhoneNumber
         this.sdk = sdk;
     }
 
-    public GetPhoneNumberRequestBuilder phoneNumberId(String phoneNumberId) {
+    public GetPhoneNumberRequestBuilder phoneNumberId(java.lang.String phoneNumberId) {
         Utils.checkNotNull(phoneNumberId, "phoneNumberId");
         this.phoneNumberId = phoneNumberId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetPhoneNumberResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetPhoneNumberResponse.java
index 8e0d43d..7d93fa2 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetPhoneNumberResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetPhoneNumberResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.PhoneNumber;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetPhoneNumberResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetPhoneNumberResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GetPhoneNumberResponse implements com.clerk.backend_api.utils.Respo
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber;
+    private Optional<? extends PhoneNumber> phoneNumber;
 
     @JsonCreator
     public GetPhoneNumberResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber) {
+            Optional<? extends PhoneNumber> phoneNumber) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.PhoneNumber> phoneNumber() {
-        return (Optional<com.clerk.backend_api.models.components.PhoneNumber>) phoneNumber;
+    public Optional<PhoneNumber> phoneNumber() {
+        return (Optional<PhoneNumber>) phoneNumber;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GetPhoneNumberResponse withRawResponse(HttpResponse<InputStream> rawRespo
     /**
      * Success
      */
-    public GetPhoneNumberResponse withPhoneNumber(com.clerk.backend_api.models.components.PhoneNumber phoneNumber) {
+    public GetPhoneNumberResponse withPhoneNumber(PhoneNumber phoneNumber) {
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         this.phoneNumber = Optional.ofNullable(phoneNumber);
         return this;
@@ -137,7 +141,7 @@ public GetPhoneNumberResponse withPhoneNumber(com.clerk.backend_api.models.compo
     /**
      * Success
      */
-    public GetPhoneNumberResponse withPhoneNumber(Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber) {
+    public GetPhoneNumberResponse withPhoneNumber(Optional<? extends PhoneNumber> phoneNumber) {
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         this.phoneNumber = phoneNumber;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetPhoneNumberResponse other = (GetPhoneNumberResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.phoneNumber, other.phoneNumber);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.phoneNumber, other.phoneNumber);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber = Optional.empty();  
+        private Optional<? extends PhoneNumber> phoneNumber = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder phoneNumber(com.clerk.backend_api.models.components.PhoneNumber phoneNumber) {
+        public Builder phoneNumber(PhoneNumber phoneNumber) {
             Utils.checkNotNull(phoneNumber, "phoneNumber");
             this.phoneNumber = Optional.ofNullable(phoneNumber);
             return this;
@@ -230,7 +234,7 @@ public Builder phoneNumber(com.clerk.backend_api.models.components.PhoneNumber p
         /**
          * Success
          */
-        public Builder phoneNumber(Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber) {
+        public Builder phoneNumber(Optional<? extends PhoneNumber> phoneNumber) {
             Utils.checkNotNull(phoneNumber, "phoneNumber");
             this.phoneNumber = phoneNumber;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetPublicInterstitialRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetPublicInterstitialRequest.java
index 168e7c1..7dea61e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetPublicInterstitialRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetPublicInterstitialRequest.java
@@ -4,36 +4,35 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class GetPublicInterstitialRequest {
 
     /**
      * The Frontend API key of your instance
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=frontendApi")
-    private Optional<? extends String> frontendApi;
+    private Optional<String> frontendApi;
 
     /**
      * The publishable key of your instance
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=publishable_key")
-    private Optional<? extends String> publishableKey;
+    private Optional<String> publishableKey;
 
     @JsonCreator
     public GetPublicInterstitialRequest(
-            Optional<? extends String> frontendApi,
-            Optional<? extends String> publishableKey) {
+            Optional<String> frontendApi,
+            Optional<String> publishableKey) {
         Utils.checkNotNull(frontendApi, "frontendApi");
         Utils.checkNotNull(publishableKey, "publishableKey");
         this.frontendApi = frontendApi;
@@ -47,19 +46,17 @@ public GetPublicInterstitialRequest() {
     /**
      * The Frontend API key of your instance
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> frontendApi() {
-        return (Optional<String>) frontendApi;
+        return frontendApi;
     }
 
     /**
      * The publishable key of your instance
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> publishableKey() {
-        return (Optional<String>) publishableKey;
+        return publishableKey;
     }
 
     public final static Builder builder() {
@@ -78,7 +75,7 @@ public GetPublicInterstitialRequest withFrontendApi(String frontendApi) {
     /**
      * The Frontend API key of your instance
      */
-    public GetPublicInterstitialRequest withFrontendApi(Optional<? extends String> frontendApi) {
+    public GetPublicInterstitialRequest withFrontendApi(Optional<String> frontendApi) {
         Utils.checkNotNull(frontendApi, "frontendApi");
         this.frontendApi = frontendApi;
         return this;
@@ -96,7 +93,7 @@ public GetPublicInterstitialRequest withPublishableKey(String publishableKey) {
     /**
      * The publishable key of your instance
      */
-    public GetPublicInterstitialRequest withPublishableKey(Optional<? extends String> publishableKey) {
+    public GetPublicInterstitialRequest withPublishableKey(Optional<String> publishableKey) {
         Utils.checkNotNull(publishableKey, "publishableKey");
         this.publishableKey = publishableKey;
         return this;
@@ -112,13 +109,13 @@ public boolean equals(java.lang.Object o) {
         }
         GetPublicInterstitialRequest other = (GetPublicInterstitialRequest) o;
         return 
-            java.util.Objects.deepEquals(this.frontendApi, other.frontendApi) &&
-            java.util.Objects.deepEquals(this.publishableKey, other.publishableKey);
+            Objects.deepEquals(this.frontendApi, other.frontendApi) &&
+            Objects.deepEquals(this.publishableKey, other.publishableKey);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             frontendApi,
             publishableKey);
     }
@@ -132,9 +129,9 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> frontendApi = Optional.empty();
+        private Optional<String> frontendApi = Optional.empty();
  
-        private Optional<? extends String> publishableKey = Optional.empty();  
+        private Optional<String> publishableKey = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -152,7 +149,7 @@ public Builder frontendApi(String frontendApi) {
         /**
          * The Frontend API key of your instance
          */
-        public Builder frontendApi(Optional<? extends String> frontendApi) {
+        public Builder frontendApi(Optional<String> frontendApi) {
             Utils.checkNotNull(frontendApi, "frontendApi");
             this.frontendApi = frontendApi;
             return this;
@@ -170,7 +167,7 @@ public Builder publishableKey(String publishableKey) {
         /**
          * The publishable key of your instance
          */
-        public Builder publishableKey(Optional<? extends String> publishableKey) {
+        public Builder publishableKey(Optional<String> publishableKey) {
             Utils.checkNotNull(publishableKey, "publishableKey");
             this.publishableKey = publishableKey;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetPublicInterstitialRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetPublicInterstitialRequestBuilder.java
index f528f17..fd09caf 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetPublicInterstitialRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetPublicInterstitialRequestBuilder.java
@@ -4,48 +4,39 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.String;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class GetPublicInterstitialRequestBuilder {
 
-    private Optional<? extends String> frontendApi = Optional.empty();
-    private Optional<? extends String> publishableKey = Optional.empty();
+    private Optional<String> frontendApi = Optional.empty();
+    private Optional<String> publishableKey = Optional.empty();
     private final SDKMethodInterfaces.MethodCallGetPublicInterstitial sdk;
 
     public GetPublicInterstitialRequestBuilder(SDKMethodInterfaces.MethodCallGetPublicInterstitial sdk) {
         this.sdk = sdk;
     }
                 
-    public GetPublicInterstitialRequestBuilder frontendApi(String frontendApi) {
+    public GetPublicInterstitialRequestBuilder frontendApi(java.lang.String frontendApi) {
         Utils.checkNotNull(frontendApi, "frontendApi");
         this.frontendApi = Optional.of(frontendApi);
         return this;
     }
 
-    public GetPublicInterstitialRequestBuilder frontendApi(Optional<? extends String> frontendApi) {
+    public GetPublicInterstitialRequestBuilder frontendApi(java.util.Optional<java.lang.String> frontendApi) {
         Utils.checkNotNull(frontendApi, "frontendApi");
         this.frontendApi = frontendApi;
         return this;
     }
                 
-    public GetPublicInterstitialRequestBuilder publishableKey(String publishableKey) {
+    public GetPublicInterstitialRequestBuilder publishableKey(java.lang.String publishableKey) {
         Utils.checkNotNull(publishableKey, "publishableKey");
         this.publishableKey = Optional.of(publishableKey);
         return this;
     }
 
-    public GetPublicInterstitialRequestBuilder publishableKey(Optional<? extends String> publishableKey) {
+    public GetPublicInterstitialRequestBuilder publishableKey(java.util.Optional<java.lang.String> publishableKey) {
         Utils.checkNotNull(publishableKey, "publishableKey");
         this.publishableKey = publishableKey;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetPublicInterstitialResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetPublicInterstitialResponse.java
index f628bec..2c66a5f 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetPublicInterstitialResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetPublicInterstitialResponse.java
@@ -4,18 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
 import java.net.http.HttpResponse;
+import java.util.Objects;
+
 
-public class GetPublicInterstitialResponse implements com.clerk.backend_api.utils.Response {
+public class GetPublicInterstitialResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -110,14 +112,14 @@ public boolean equals(java.lang.Object o) {
         }
         GetPublicInterstitialResponse other = (GetPublicInterstitialResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse);
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetRedirectURLRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetRedirectURLRequest.java
index 845d39a..2f57084 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetRedirectURLRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetRedirectURLRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetRedirectURLRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         GetRedirectURLRequest other = (GetRedirectURLRequest) o;
         return 
-            java.util.Objects.deepEquals(this.id, other.id);
+            Objects.deepEquals(this.id, other.id);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             id);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetRedirectURLRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetRedirectURLRequestBuilder.java
index ff71feb..e2eeb6a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetRedirectURLRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetRedirectURLRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class GetRedirectURLRequestBuilder {
 
@@ -26,7 +16,7 @@ public GetRedirectURLRequestBuilder(SDKMethodInterfaces.MethodCallGetRedirectURL
         this.sdk = sdk;
     }
 
-    public GetRedirectURLRequestBuilder id(String id) {
+    public GetRedirectURLRequestBuilder id(java.lang.String id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetRedirectURLResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetRedirectURLResponse.java
index 6ec8d0b..b9b73e4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetRedirectURLResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetRedirectURLResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.RedirectURL;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetRedirectURLResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetRedirectURLResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GetRedirectURLResponse implements com.clerk.backend_api.utils.Respo
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.RedirectURL> redirectURL;
+    private Optional<? extends RedirectURL> redirectURL;
 
     @JsonCreator
     public GetRedirectURLResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.RedirectURL> redirectURL) {
+            Optional<? extends RedirectURL> redirectURL) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.RedirectURL> redirectURL() {
-        return (Optional<com.clerk.backend_api.models.components.RedirectURL>) redirectURL;
+    public Optional<RedirectURL> redirectURL() {
+        return (Optional<RedirectURL>) redirectURL;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GetRedirectURLResponse withRawResponse(HttpResponse<InputStream> rawRespo
     /**
      * Success
      */
-    public GetRedirectURLResponse withRedirectURL(com.clerk.backend_api.models.components.RedirectURL redirectURL) {
+    public GetRedirectURLResponse withRedirectURL(RedirectURL redirectURL) {
         Utils.checkNotNull(redirectURL, "redirectURL");
         this.redirectURL = Optional.ofNullable(redirectURL);
         return this;
@@ -137,7 +141,7 @@ public GetRedirectURLResponse withRedirectURL(com.clerk.backend_api.models.compo
     /**
      * Success
      */
-    public GetRedirectURLResponse withRedirectURL(Optional<? extends com.clerk.backend_api.models.components.RedirectURL> redirectURL) {
+    public GetRedirectURLResponse withRedirectURL(Optional<? extends RedirectURL> redirectURL) {
         Utils.checkNotNull(redirectURL, "redirectURL");
         this.redirectURL = redirectURL;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetRedirectURLResponse other = (GetRedirectURLResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.redirectURL, other.redirectURL);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.redirectURL, other.redirectURL);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.RedirectURL> redirectURL = Optional.empty();  
+        private Optional<? extends RedirectURL> redirectURL = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder redirectURL(com.clerk.backend_api.models.components.RedirectURL redirectURL) {
+        public Builder redirectURL(RedirectURL redirectURL) {
             Utils.checkNotNull(redirectURL, "redirectURL");
             this.redirectURL = Optional.ofNullable(redirectURL);
             return this;
@@ -230,7 +234,7 @@ public Builder redirectURL(com.clerk.backend_api.models.components.RedirectURL r
         /**
          * Success
          */
-        public Builder redirectURL(Optional<? extends com.clerk.backend_api.models.components.RedirectURL> redirectURL) {
+        public Builder redirectURL(Optional<? extends RedirectURL> redirectURL) {
             Utils.checkNotNull(redirectURL, "redirectURL");
             this.redirectURL = redirectURL;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetSAMLConnectionRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetSAMLConnectionRequest.java
index 63552d3..b0d1df3 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetSAMLConnectionRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetSAMLConnectionRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetSAMLConnectionRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         GetSAMLConnectionRequest other = (GetSAMLConnectionRequest) o;
         return 
-            java.util.Objects.deepEquals(this.samlConnectionId, other.samlConnectionId);
+            Objects.deepEquals(this.samlConnectionId, other.samlConnectionId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             samlConnectionId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetSAMLConnectionRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetSAMLConnectionRequestBuilder.java
index 89e2757..d8f179c 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetSAMLConnectionRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetSAMLConnectionRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class GetSAMLConnectionRequestBuilder {
 
@@ -26,7 +16,7 @@ public GetSAMLConnectionRequestBuilder(SDKMethodInterfaces.MethodCallGetSAMLConn
         this.sdk = sdk;
     }
 
-    public GetSAMLConnectionRequestBuilder samlConnectionId(String samlConnectionId) {
+    public GetSAMLConnectionRequestBuilder samlConnectionId(java.lang.String samlConnectionId) {
         Utils.checkNotNull(samlConnectionId, "samlConnectionId");
         this.samlConnectionId = samlConnectionId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetSAMLConnectionResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetSAMLConnectionResponse.java
index f0c00fa..260b8a9 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetSAMLConnectionResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetSAMLConnectionResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.SAMLConnection;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetSAMLConnectionResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetSAMLConnectionResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GetSAMLConnectionResponse implements com.clerk.backend_api.utils.Re
     /**
      * A SAML Connection
      */
-    private Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection;
+    private Optional<? extends SAMLConnection> samlConnection;
 
     @JsonCreator
     public GetSAMLConnectionResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection) {
+            Optional<? extends SAMLConnection> samlConnection) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.SAMLConnection> samlConnection() {
-        return (Optional<com.clerk.backend_api.models.components.SAMLConnection>) samlConnection;
+    public Optional<SAMLConnection> samlConnection() {
+        return (Optional<SAMLConnection>) samlConnection;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GetSAMLConnectionResponse withRawResponse(HttpResponse<InputStream> rawRe
     /**
      * A SAML Connection
      */
-    public GetSAMLConnectionResponse withSAMLConnection(com.clerk.backend_api.models.components.SAMLConnection samlConnection) {
+    public GetSAMLConnectionResponse withSAMLConnection(SAMLConnection samlConnection) {
         Utils.checkNotNull(samlConnection, "samlConnection");
         this.samlConnection = Optional.ofNullable(samlConnection);
         return this;
@@ -137,7 +141,7 @@ public GetSAMLConnectionResponse withSAMLConnection(com.clerk.backend_api.models
     /**
      * A SAML Connection
      */
-    public GetSAMLConnectionResponse withSAMLConnection(Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection) {
+    public GetSAMLConnectionResponse withSAMLConnection(Optional<? extends SAMLConnection> samlConnection) {
         Utils.checkNotNull(samlConnection, "samlConnection");
         this.samlConnection = samlConnection;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetSAMLConnectionResponse other = (GetSAMLConnectionResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.samlConnection, other.samlConnection);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.samlConnection, other.samlConnection);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection = Optional.empty();  
+        private Optional<? extends SAMLConnection> samlConnection = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A SAML Connection
          */
-        public Builder samlConnection(com.clerk.backend_api.models.components.SAMLConnection samlConnection) {
+        public Builder samlConnection(SAMLConnection samlConnection) {
             Utils.checkNotNull(samlConnection, "samlConnection");
             this.samlConnection = Optional.ofNullable(samlConnection);
             return this;
@@ -230,7 +234,7 @@ public Builder samlConnection(com.clerk.backend_api.models.components.SAMLConnec
         /**
          * A SAML Connection
          */
-        public Builder samlConnection(Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection) {
+        public Builder samlConnection(Optional<? extends SAMLConnection> samlConnection) {
             Utils.checkNotNull(samlConnection, "samlConnection");
             this.samlConnection = samlConnection;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetSessionListRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetSessionListRequest.java
index 4badbea..9e0a686 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetSessionListRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetSessionListRequest.java
@@ -4,32 +4,34 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class GetSessionListRequest {
 
     /**
      * List sessions for the given client
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=client_id")
-    private Optional<? extends String> clientId;
+    private Optional<String> clientId;
 
     /**
      * List sessions for the given user
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=user_id")
-    private Optional<? extends String> userId;
+    private Optional<String> userId;
 
     /**
      * Filter sessions by the provided status
@@ -42,7 +44,7 @@ public class GetSessionListRequest {
      * Can be used for paginating the results together with `offset`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=limit")
-    private Optional<? extends Long> limit;
+    private Optional<Long> limit;
 
     /**
      * Skip the first `offset` results when paginating.
@@ -50,15 +52,15 @@ public class GetSessionListRequest {
      * To be used in conjunction with `limit`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=offset")
-    private Optional<? extends Long> offset;
+    private Optional<Long> offset;
 
     @JsonCreator
     public GetSessionListRequest(
-            Optional<? extends String> clientId,
-            Optional<? extends String> userId,
+            Optional<String> clientId,
+            Optional<String> userId,
             Optional<? extends Status> status,
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) {
+            Optional<Long> limit,
+            Optional<Long> offset) {
         Utils.checkNotNull(clientId, "clientId");
         Utils.checkNotNull(userId, "userId");
         Utils.checkNotNull(status, "status");
@@ -78,19 +80,17 @@ public GetSessionListRequest() {
     /**
      * List sessions for the given client
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> clientId() {
-        return (Optional<String>) clientId;
+        return clientId;
     }
 
     /**
      * List sessions for the given user
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> userId() {
-        return (Optional<String>) userId;
+        return userId;
     }
 
     /**
@@ -106,10 +106,9 @@ public Optional<Status> status() {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> limit() {
-        return (Optional<Long>) limit;
+        return limit;
     }
 
     /**
@@ -117,10 +116,9 @@ public Optional<Long> limit() {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> offset() {
-        return (Optional<Long>) offset;
+        return offset;
     }
 
     public final static Builder builder() {
@@ -139,7 +137,7 @@ public GetSessionListRequest withClientId(String clientId) {
     /**
      * List sessions for the given client
      */
-    public GetSessionListRequest withClientId(Optional<? extends String> clientId) {
+    public GetSessionListRequest withClientId(Optional<String> clientId) {
         Utils.checkNotNull(clientId, "clientId");
         this.clientId = clientId;
         return this;
@@ -157,7 +155,7 @@ public GetSessionListRequest withUserId(String userId) {
     /**
      * List sessions for the given user
      */
-    public GetSessionListRequest withUserId(Optional<? extends String> userId) {
+    public GetSessionListRequest withUserId(Optional<String> userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
@@ -195,7 +193,7 @@ public GetSessionListRequest withLimit(long limit) {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    public GetSessionListRequest withLimit(Optional<? extends Long> limit) {
+    public GetSessionListRequest withLimit(Optional<Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -217,7 +215,7 @@ public GetSessionListRequest withOffset(long offset) {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    public GetSessionListRequest withOffset(Optional<? extends Long> offset) {
+    public GetSessionListRequest withOffset(Optional<Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -233,16 +231,16 @@ public boolean equals(java.lang.Object o) {
         }
         GetSessionListRequest other = (GetSessionListRequest) o;
         return 
-            java.util.Objects.deepEquals(this.clientId, other.clientId) &&
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.status, other.status) &&
-            java.util.Objects.deepEquals(this.limit, other.limit) &&
-            java.util.Objects.deepEquals(this.offset, other.offset);
+            Objects.deepEquals(this.clientId, other.clientId) &&
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.status, other.status) &&
+            Objects.deepEquals(this.limit, other.limit) &&
+            Objects.deepEquals(this.offset, other.offset);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             clientId,
             userId,
             status,
@@ -262,15 +260,15 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> clientId = Optional.empty();
+        private Optional<String> clientId = Optional.empty();
  
-        private Optional<? extends String> userId = Optional.empty();
+        private Optional<String> userId = Optional.empty();
  
         private Optional<? extends Status> status = Optional.empty();
  
-        private Optional<? extends Long> limit;
+        private Optional<Long> limit;
  
-        private Optional<? extends Long> offset;  
+        private Optional<Long> offset;  
         
         private Builder() {
           // force use of static builder() method
@@ -288,7 +286,7 @@ public Builder clientId(String clientId) {
         /**
          * List sessions for the given client
          */
-        public Builder clientId(Optional<? extends String> clientId) {
+        public Builder clientId(Optional<String> clientId) {
             Utils.checkNotNull(clientId, "clientId");
             this.clientId = clientId;
             return this;
@@ -306,7 +304,7 @@ public Builder userId(String userId) {
         /**
          * List sessions for the given user
          */
-        public Builder userId(Optional<? extends String> userId) {
+        public Builder userId(Optional<String> userId) {
             Utils.checkNotNull(userId, "userId");
             this.userId = userId;
             return this;
@@ -344,7 +342,7 @@ public Builder limit(long limit) {
          * Applies a limit to the number of results returned.
          * Can be used for paginating the results together with `offset`.
          */
-        public Builder limit(Optional<? extends Long> limit) {
+        public Builder limit(Optional<Long> limit) {
             Utils.checkNotNull(limit, "limit");
             this.limit = limit;
             return this;
@@ -366,7 +364,7 @@ public Builder offset(long offset) {
          * Needs to be an integer greater or equal to zero.
          * To be used in conjunction with `limit`.
          */
-        public Builder offset(Optional<? extends Long> offset) {
+        public Builder offset(Optional<Long> offset) {
             Utils.checkNotNull(offset, "offset");
             this.offset = offset;
             return this;
@@ -387,17 +385,17 @@ public GetSessionListRequest build() {
                 offset);
         }
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
                 new LazySingletonValue<>(
                         "limit",
                         "10",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
                 new LazySingletonValue<>(
                         "offset",
                         "0",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetSessionListRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetSessionListRequestBuilder.java
index f3bf2bb..7beaf9f 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetSessionListRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetSessionListRequestBuilder.java
@@ -4,18 +4,7 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class GetSessionListRequestBuilder {
 
@@ -26,7 +15,7 @@ public GetSessionListRequestBuilder(SDKMethodInterfaces.MethodCallGetSessionList
         this.sdk = sdk;
     }
 
-    public GetSessionListRequestBuilder request(GetSessionListRequest request) {
+    public GetSessionListRequestBuilder request(com.clerk.backend_api.models.operations.GetSessionListRequest request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetSessionListResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetSessionListResponse.java
index 108e629..00a0665 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetSessionListResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetSessionListResponse.java
@@ -4,19 +4,24 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Session;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetSessionListResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetSessionListResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +41,14 @@ public class GetSessionListResponse implements com.clerk.backend_api.utils.Respo
     /**
      * Success
      */
-    private Optional<? extends java.util.List<com.clerk.backend_api.models.components.Session>> sessionList;
+    private Optional<? extends List<Session>> sessionList;
 
     @JsonCreator
     public GetSessionListResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends java.util.List<com.clerk.backend_api.models.components.Session>> sessionList) {
+            Optional<? extends List<Session>> sessionList) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +95,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<com.clerk.backend_api.models.components.Session>> sessionList() {
-        return (Optional<java.util.List<com.clerk.backend_api.models.components.Session>>) sessionList;
+    public Optional<List<Session>> sessionList() {
+        return (Optional<List<Session>>) sessionList;
     }
 
     public final static Builder builder() {
@@ -128,7 +133,7 @@ public GetSessionListResponse withRawResponse(HttpResponse<InputStream> rawRespo
     /**
      * Success
      */
-    public GetSessionListResponse withSessionList(java.util.List<com.clerk.backend_api.models.components.Session> sessionList) {
+    public GetSessionListResponse withSessionList(List<Session> sessionList) {
         Utils.checkNotNull(sessionList, "sessionList");
         this.sessionList = Optional.ofNullable(sessionList);
         return this;
@@ -137,7 +142,7 @@ public GetSessionListResponse withSessionList(java.util.List<com.clerk.backend_a
     /**
      * Success
      */
-    public GetSessionListResponse withSessionList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.Session>> sessionList) {
+    public GetSessionListResponse withSessionList(Optional<? extends List<Session>> sessionList) {
         Utils.checkNotNull(sessionList, "sessionList");
         this.sessionList = sessionList;
         return this;
@@ -153,15 +158,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetSessionListResponse other = (GetSessionListResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.sessionList, other.sessionList);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.sessionList, other.sessionList);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +190,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends java.util.List<com.clerk.backend_api.models.components.Session>> sessionList = Optional.empty();  
+        private Optional<? extends List<Session>> sessionList = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +226,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder sessionList(java.util.List<com.clerk.backend_api.models.components.Session> sessionList) {
+        public Builder sessionList(List<Session> sessionList) {
             Utils.checkNotNull(sessionList, "sessionList");
             this.sessionList = Optional.ofNullable(sessionList);
             return this;
@@ -230,7 +235,7 @@ public Builder sessionList(java.util.List<com.clerk.backend_api.models.component
         /**
          * Success
          */
-        public Builder sessionList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.Session>> sessionList) {
+        public Builder sessionList(Optional<? extends List<Session>> sessionList) {
             Utils.checkNotNull(sessionList, "sessionList");
             this.sessionList = sessionList;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetSessionRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetSessionRequest.java
index c1bef55..749baec 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetSessionRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetSessionRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetSessionRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         GetSessionRequest other = (GetSessionRequest) o;
         return 
-            java.util.Objects.deepEquals(this.sessionId, other.sessionId);
+            Objects.deepEquals(this.sessionId, other.sessionId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             sessionId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetSessionRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetSessionRequestBuilder.java
index afccf7a..6bb4f7f 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetSessionRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetSessionRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class GetSessionRequestBuilder {
 
@@ -26,7 +16,7 @@ public GetSessionRequestBuilder(SDKMethodInterfaces.MethodCallGetSession sdk) {
         this.sdk = sdk;
     }
 
-    public GetSessionRequestBuilder sessionId(String sessionId) {
+    public GetSessionRequestBuilder sessionId(java.lang.String sessionId) {
         Utils.checkNotNull(sessionId, "sessionId");
         this.sessionId = sessionId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetSessionResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetSessionResponse.java
index f198006..509d540 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetSessionResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetSessionResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Session;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetSessionResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetSessionResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GetSessionResponse implements com.clerk.backend_api.utils.Response
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Session> session;
+    private Optional<? extends Session> session;
 
     @JsonCreator
     public GetSessionResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Session> session) {
+            Optional<? extends Session> session) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Session> session() {
-        return (Optional<com.clerk.backend_api.models.components.Session>) session;
+    public Optional<Session> session() {
+        return (Optional<Session>) session;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GetSessionResponse withRawResponse(HttpResponse<InputStream> rawResponse)
     /**
      * Success
      */
-    public GetSessionResponse withSession(com.clerk.backend_api.models.components.Session session) {
+    public GetSessionResponse withSession(Session session) {
         Utils.checkNotNull(session, "session");
         this.session = Optional.ofNullable(session);
         return this;
@@ -137,7 +141,7 @@ public GetSessionResponse withSession(com.clerk.backend_api.models.components.Se
     /**
      * Success
      */
-    public GetSessionResponse withSession(Optional<? extends com.clerk.backend_api.models.components.Session> session) {
+    public GetSessionResponse withSession(Optional<? extends Session> session) {
         Utils.checkNotNull(session, "session");
         this.session = session;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetSessionResponse other = (GetSessionResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.session, other.session);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.session, other.session);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Session> session = Optional.empty();  
+        private Optional<? extends Session> session = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder session(com.clerk.backend_api.models.components.Session session) {
+        public Builder session(Session session) {
             Utils.checkNotNull(session, "session");
             this.session = Optional.ofNullable(session);
             return this;
@@ -230,7 +234,7 @@ public Builder session(com.clerk.backend_api.models.components.Session session)
         /**
          * Success
          */
-        public Builder session(Optional<? extends com.clerk.backend_api.models.components.Session> session) {
+        public Builder session(Optional<? extends Session> session) {
             Utils.checkNotNull(session, "session");
             this.session = session;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetTemplateListRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetTemplateListRequest.java
index 7204eb3..8d7a776 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetTemplateListRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetTemplateListRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetTemplateListRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         GetTemplateListRequest other = (GetTemplateListRequest) o;
         return 
-            java.util.Objects.deepEquals(this.templateType, other.templateType);
+            Objects.deepEquals(this.templateType, other.templateType);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             templateType);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetTemplateListRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetTemplateListRequestBuilder.java
index 193d3bc..dcf8b3c 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetTemplateListRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetTemplateListRequestBuilder.java
@@ -4,18 +4,7 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class GetTemplateListRequestBuilder {
 
@@ -26,7 +15,7 @@ public GetTemplateListRequestBuilder(SDKMethodInterfaces.MethodCallGetTemplateLi
         this.sdk = sdk;
     }
 
-    public GetTemplateListRequestBuilder templateType(TemplateType templateType) {
+    public GetTemplateListRequestBuilder templateType(com.clerk.backend_api.models.operations.TemplateType templateType) {
         Utils.checkNotNull(templateType, "templateType");
         this.templateType = templateType;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetTemplateListResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetTemplateListResponse.java
index fd7e272..754aaba 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetTemplateListResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetTemplateListResponse.java
@@ -4,19 +4,24 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Template;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetTemplateListResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetTemplateListResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +41,14 @@ public class GetTemplateListResponse implements com.clerk.backend_api.utils.Resp
     /**
      * Success
      */
-    private Optional<? extends java.util.List<com.clerk.backend_api.models.components.Template>> templateList;
+    private Optional<? extends List<Template>> templateList;
 
     @JsonCreator
     public GetTemplateListResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends java.util.List<com.clerk.backend_api.models.components.Template>> templateList) {
+            Optional<? extends List<Template>> templateList) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +95,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<com.clerk.backend_api.models.components.Template>> templateList() {
-        return (Optional<java.util.List<com.clerk.backend_api.models.components.Template>>) templateList;
+    public Optional<List<Template>> templateList() {
+        return (Optional<List<Template>>) templateList;
     }
 
     public final static Builder builder() {
@@ -128,7 +133,7 @@ public GetTemplateListResponse withRawResponse(HttpResponse<InputStream> rawResp
     /**
      * Success
      */
-    public GetTemplateListResponse withTemplateList(java.util.List<com.clerk.backend_api.models.components.Template> templateList) {
+    public GetTemplateListResponse withTemplateList(List<Template> templateList) {
         Utils.checkNotNull(templateList, "templateList");
         this.templateList = Optional.ofNullable(templateList);
         return this;
@@ -137,7 +142,7 @@ public GetTemplateListResponse withTemplateList(java.util.List<com.clerk.backend
     /**
      * Success
      */
-    public GetTemplateListResponse withTemplateList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.Template>> templateList) {
+    public GetTemplateListResponse withTemplateList(Optional<? extends List<Template>> templateList) {
         Utils.checkNotNull(templateList, "templateList");
         this.templateList = templateList;
         return this;
@@ -153,15 +158,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetTemplateListResponse other = (GetTemplateListResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.templateList, other.templateList);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.templateList, other.templateList);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +190,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends java.util.List<com.clerk.backend_api.models.components.Template>> templateList = Optional.empty();  
+        private Optional<? extends List<Template>> templateList = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +226,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder templateList(java.util.List<com.clerk.backend_api.models.components.Template> templateList) {
+        public Builder templateList(List<Template> templateList) {
             Utils.checkNotNull(templateList, "templateList");
             this.templateList = Optional.ofNullable(templateList);
             return this;
@@ -230,7 +235,7 @@ public Builder templateList(java.util.List<com.clerk.backend_api.models.componen
         /**
          * Success
          */
-        public Builder templateList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.Template>> templateList) {
+        public Builder templateList(Optional<? extends List<Template>> templateList) {
             Utils.checkNotNull(templateList, "templateList");
             this.templateList = templateList;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetTemplateRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetTemplateRequest.java
index fa94a15..acacb37 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetTemplateRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetTemplateRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetTemplateRequest {
 
@@ -87,13 +86,13 @@ public boolean equals(java.lang.Object o) {
         }
         GetTemplateRequest other = (GetTemplateRequest) o;
         return 
-            java.util.Objects.deepEquals(this.templateType, other.templateType) &&
-            java.util.Objects.deepEquals(this.slug, other.slug);
+            Objects.deepEquals(this.templateType, other.templateType) &&
+            Objects.deepEquals(this.slug, other.slug);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             templateType,
             slug);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetTemplateRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetTemplateRequestBuilder.java
index 7ef7239..c6ad6c8 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetTemplateRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetTemplateRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class GetTemplateRequestBuilder {
 
@@ -27,13 +17,13 @@ public GetTemplateRequestBuilder(SDKMethodInterfaces.MethodCallGetTemplate sdk)
         this.sdk = sdk;
     }
 
-    public GetTemplateRequestBuilder templateType(PathParamTemplateType templateType) {
+    public GetTemplateRequestBuilder templateType(com.clerk.backend_api.models.operations.PathParamTemplateType templateType) {
         Utils.checkNotNull(templateType, "templateType");
         this.templateType = templateType;
         return this;
     }
 
-    public GetTemplateRequestBuilder slug(String slug) {
+    public GetTemplateRequestBuilder slug(java.lang.String slug) {
         Utils.checkNotNull(slug, "slug");
         this.slug = slug;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetTemplateResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetTemplateResponse.java
index fa73b22..2bae3a9 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetTemplateResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetTemplateResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Template;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetTemplateResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetTemplateResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GetTemplateResponse implements com.clerk.backend_api.utils.Response
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Template> template;
+    private Optional<? extends Template> template;
 
     @JsonCreator
     public GetTemplateResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Template> template) {
+            Optional<? extends Template> template) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Template> template() {
-        return (Optional<com.clerk.backend_api.models.components.Template>) template;
+    public Optional<Template> template() {
+        return (Optional<Template>) template;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GetTemplateResponse withRawResponse(HttpResponse<InputStream> rawResponse
     /**
      * Success
      */
-    public GetTemplateResponse withTemplate(com.clerk.backend_api.models.components.Template template) {
+    public GetTemplateResponse withTemplate(Template template) {
         Utils.checkNotNull(template, "template");
         this.template = Optional.ofNullable(template);
         return this;
@@ -137,7 +141,7 @@ public GetTemplateResponse withTemplate(com.clerk.backend_api.models.components.
     /**
      * Success
      */
-    public GetTemplateResponse withTemplate(Optional<? extends com.clerk.backend_api.models.components.Template> template) {
+    public GetTemplateResponse withTemplate(Optional<? extends Template> template) {
         Utils.checkNotNull(template, "template");
         this.template = template;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetTemplateResponse other = (GetTemplateResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.template, other.template);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.template, other.template);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Template> template = Optional.empty();  
+        private Optional<? extends Template> template = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder template(com.clerk.backend_api.models.components.Template template) {
+        public Builder template(Template template) {
             Utils.checkNotNull(template, "template");
             this.template = Optional.ofNullable(template);
             return this;
@@ -230,7 +234,7 @@ public Builder template(com.clerk.backend_api.models.components.Template templat
         /**
          * Success
          */
-        public Builder template(Optional<? extends com.clerk.backend_api.models.components.Template> template) {
+        public Builder template(Optional<? extends Template> template) {
             Utils.checkNotNull(template, "template");
             this.template = template;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetUserListRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetUserListRequest.java
index e1a9e94..bd16f05 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetUserListRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetUserListRequest.java
@@ -4,19 +4,22 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class GetUserListRequest {
 
     /**
@@ -25,7 +28,7 @@ public class GetUserListRequest {
      * Any email addresses not found are ignored.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=email_address")
-    private Optional<? extends java.util.List<String>> emailAddress;
+    private Optional<? extends List<String>> emailAddress;
 
     /**
      * Returns users with the specified phone numbers.
@@ -33,7 +36,7 @@ public class GetUserListRequest {
      * Any phone numbers not found are ignored.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=phone_number")
-    private Optional<? extends java.util.List<String>> phoneNumber;
+    private Optional<? extends List<String>> phoneNumber;
 
     /**
      * Returns users with the specified external ids.
@@ -45,7 +48,7 @@ public class GetUserListRequest {
      * Any external ids not found are ignored.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=external_id")
-    private Optional<? extends java.util.List<String>> externalId;
+    private Optional<? extends List<String>> externalId;
 
     /**
      * Returns users with the specified usernames.
@@ -53,7 +56,7 @@ public class GetUserListRequest {
      * Any usernames not found are ignored.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=username")
-    private Optional<? extends java.util.List<String>> username;
+    private Optional<? extends List<String>> username;
 
     /**
      * Returns users with the specified web3 wallet addresses.
@@ -61,7 +64,7 @@ public class GetUserListRequest {
      * Any web3 wallet addressed not found are ignored.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=web3_wallet")
-    private Optional<? extends java.util.List<String>> web3Wallet;
+    private Optional<? extends List<String>> web3Wallet;
 
     /**
      * Returns users with the user ids specified.
@@ -73,7 +76,7 @@ public class GetUserListRequest {
      * Any user ids not found are ignored.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=user_id")
-    private Optional<? extends java.util.List<String>> userId;
+    private Optional<? extends List<String>> userId;
 
     /**
      * Returns users that have memberships to the
@@ -85,7 +88,7 @@ public class GetUserListRequest {
      * Accepts up to 100 organization ids.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=organization_id")
-    private Optional<? extends java.util.List<String>> organizationId;
+    private Optional<? extends List<String>> organizationId;
 
     /**
      * Returns users that match the given query.
@@ -93,7 +96,7 @@ public class GetUserListRequest {
      * The query value doesn't need to match the exact value you are looking for, it is capable of partial matches as well.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=query")
-    private Optional<? extends String> query;
+    private Optional<String> query;
 
     /**
      * Returns users that had session activity since the given date, with day precision.
@@ -101,14 +104,14 @@ public class GetUserListRequest {
      * Example: use 1700690400000 to retrieve users that had session activity from 2023-11-23 until the current day.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=last_active_at_since")
-    private Optional<? extends Long> lastActiveAtSince;
+    private Optional<Long> lastActiveAtSince;
 
     /**
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=limit")
-    private Optional<? extends Long> limit;
+    private Optional<Long> limit;
 
     /**
      * Skip the first `offset` results when paginating.
@@ -116,7 +119,7 @@ public class GetUserListRequest {
      * To be used in conjunction with `limit`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=offset")
-    private Optional<? extends Long> offset;
+    private Optional<Long> offset;
 
     /**
      * Allows to return users in a particular order.
@@ -127,22 +130,22 @@ public class GetUserListRequest {
      * if you pass `order_by=username&amp;order_by=created_at`, we will consider only the first `order_by` parameter, which is `username`. The `created_at` parameter will be ignored in this case.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=order_by")
-    private Optional<? extends String> orderBy;
+    private Optional<String> orderBy;
 
     @JsonCreator
     public GetUserListRequest(
-            Optional<? extends java.util.List<String>> emailAddress,
-            Optional<? extends java.util.List<String>> phoneNumber,
-            Optional<? extends java.util.List<String>> externalId,
-            Optional<? extends java.util.List<String>> username,
-            Optional<? extends java.util.List<String>> web3Wallet,
-            Optional<? extends java.util.List<String>> userId,
-            Optional<? extends java.util.List<String>> organizationId,
-            Optional<? extends String> query,
-            Optional<? extends Long> lastActiveAtSince,
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset,
-            Optional<? extends String> orderBy) {
+            Optional<? extends List<String>> emailAddress,
+            Optional<? extends List<String>> phoneNumber,
+            Optional<? extends List<String>> externalId,
+            Optional<? extends List<String>> username,
+            Optional<? extends List<String>> web3Wallet,
+            Optional<? extends List<String>> userId,
+            Optional<? extends List<String>> organizationId,
+            Optional<String> query,
+            Optional<Long> lastActiveAtSince,
+            Optional<Long> limit,
+            Optional<Long> offset,
+            Optional<String> orderBy) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         Utils.checkNotNull(externalId, "externalId");
@@ -180,8 +183,8 @@ public GetUserListRequest() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> emailAddress() {
-        return (Optional<java.util.List<String>>) emailAddress;
+    public Optional<List<String>> emailAddress() {
+        return (Optional<List<String>>) emailAddress;
     }
 
     /**
@@ -191,8 +194,8 @@ public Optional<java.util.List<String>> emailAddress() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> phoneNumber() {
-        return (Optional<java.util.List<String>>) phoneNumber;
+    public Optional<List<String>> phoneNumber() {
+        return (Optional<List<String>>) phoneNumber;
     }
 
     /**
@@ -206,8 +209,8 @@ public Optional<java.util.List<String>> phoneNumber() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> externalId() {
-        return (Optional<java.util.List<String>>) externalId;
+    public Optional<List<String>> externalId() {
+        return (Optional<List<String>>) externalId;
     }
 
     /**
@@ -217,8 +220,8 @@ public Optional<java.util.List<String>> externalId() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> username() {
-        return (Optional<java.util.List<String>>) username;
+    public Optional<List<String>> username() {
+        return (Optional<List<String>>) username;
     }
 
     /**
@@ -228,8 +231,8 @@ public Optional<java.util.List<String>> username() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> web3Wallet() {
-        return (Optional<java.util.List<String>>) web3Wallet;
+    public Optional<List<String>> web3Wallet() {
+        return (Optional<List<String>>) web3Wallet;
     }
 
     /**
@@ -243,8 +246,8 @@ public Optional<java.util.List<String>> web3Wallet() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> userId() {
-        return (Optional<java.util.List<String>>) userId;
+    public Optional<List<String>> userId() {
+        return (Optional<List<String>>) userId;
     }
 
     /**
@@ -258,8 +261,8 @@ public Optional<java.util.List<String>> userId() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> organizationId() {
-        return (Optional<java.util.List<String>>) organizationId;
+    public Optional<List<String>> organizationId() {
+        return (Optional<List<String>>) organizationId;
     }
 
     /**
@@ -267,10 +270,9 @@ public Optional<java.util.List<String>> organizationId() {
      * For possible matches, we check the email addresses, phone numbers, usernames, web3 wallets, user ids, first and last names.
      * The query value doesn't need to match the exact value you are looking for, it is capable of partial matches as well.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> query() {
-        return (Optional<String>) query;
+        return query;
     }
 
     /**
@@ -278,20 +280,18 @@ public Optional<String> query() {
      * Providing a value with higher precision than day will result in an error.
      * Example: use 1700690400000 to retrieve users that had session activity from 2023-11-23 until the current day.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> lastActiveAtSince() {
-        return (Optional<Long>) lastActiveAtSince;
+        return lastActiveAtSince;
     }
 
     /**
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> limit() {
-        return (Optional<Long>) limit;
+        return limit;
     }
 
     /**
@@ -299,10 +299,9 @@ public Optional<Long> limit() {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> offset() {
-        return (Optional<Long>) offset;
+        return offset;
     }
 
     /**
@@ -313,10 +312,9 @@ public Optional<Long> offset() {
      * If you don't use `+` or `-`, then `+` is implied. We only support one `order_by` parameter, and if multiple `order_by` parameters are provided, we will only keep the first one. For example,
      * if you pass `order_by=username&amp;order_by=created_at`, we will consider only the first `order_by` parameter, which is `username`. The `created_at` parameter will be ignored in this case.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> orderBy() {
-        return (Optional<String>) orderBy;
+        return orderBy;
     }
 
     public final static Builder builder() {
@@ -328,7 +326,7 @@ public final static Builder builder() {
      * Accepts up to 100 email addresses.
      * Any email addresses not found are ignored.
      */
-    public GetUserListRequest withEmailAddress(java.util.List<String> emailAddress) {
+    public GetUserListRequest withEmailAddress(List<String> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = Optional.ofNullable(emailAddress);
         return this;
@@ -339,7 +337,7 @@ public GetUserListRequest withEmailAddress(java.util.List<String> emailAddress)
      * Accepts up to 100 email addresses.
      * Any email addresses not found are ignored.
      */
-    public GetUserListRequest withEmailAddress(Optional<? extends java.util.List<String>> emailAddress) {
+    public GetUserListRequest withEmailAddress(Optional<? extends List<String>> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = emailAddress;
         return this;
@@ -350,7 +348,7 @@ public GetUserListRequest withEmailAddress(Optional<? extends java.util.List<Str
      * Accepts up to 100 phone numbers.
      * Any phone numbers not found are ignored.
      */
-    public GetUserListRequest withPhoneNumber(java.util.List<String> phoneNumber) {
+    public GetUserListRequest withPhoneNumber(List<String> phoneNumber) {
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         this.phoneNumber = Optional.ofNullable(phoneNumber);
         return this;
@@ -361,7 +359,7 @@ public GetUserListRequest withPhoneNumber(java.util.List<String> phoneNumber) {
      * Accepts up to 100 phone numbers.
      * Any phone numbers not found are ignored.
      */
-    public GetUserListRequest withPhoneNumber(Optional<? extends java.util.List<String>> phoneNumber) {
+    public GetUserListRequest withPhoneNumber(Optional<? extends List<String>> phoneNumber) {
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         this.phoneNumber = phoneNumber;
         return this;
@@ -376,7 +374,7 @@ public GetUserListRequest withPhoneNumber(Optional<? extends java.util.List<Stri
      * Accepts up to 100 external ids.
      * Any external ids not found are ignored.
      */
-    public GetUserListRequest withExternalId(java.util.List<String> externalId) {
+    public GetUserListRequest withExternalId(List<String> externalId) {
         Utils.checkNotNull(externalId, "externalId");
         this.externalId = Optional.ofNullable(externalId);
         return this;
@@ -391,7 +389,7 @@ public GetUserListRequest withExternalId(java.util.List<String> externalId) {
      * Accepts up to 100 external ids.
      * Any external ids not found are ignored.
      */
-    public GetUserListRequest withExternalId(Optional<? extends java.util.List<String>> externalId) {
+    public GetUserListRequest withExternalId(Optional<? extends List<String>> externalId) {
         Utils.checkNotNull(externalId, "externalId");
         this.externalId = externalId;
         return this;
@@ -402,7 +400,7 @@ public GetUserListRequest withExternalId(Optional<? extends java.util.List<Strin
      * Accepts up to 100 usernames.
      * Any usernames not found are ignored.
      */
-    public GetUserListRequest withUsername(java.util.List<String> username) {
+    public GetUserListRequest withUsername(List<String> username) {
         Utils.checkNotNull(username, "username");
         this.username = Optional.ofNullable(username);
         return this;
@@ -413,7 +411,7 @@ public GetUserListRequest withUsername(java.util.List<String> username) {
      * Accepts up to 100 usernames.
      * Any usernames not found are ignored.
      */
-    public GetUserListRequest withUsername(Optional<? extends java.util.List<String>> username) {
+    public GetUserListRequest withUsername(Optional<? extends List<String>> username) {
         Utils.checkNotNull(username, "username");
         this.username = username;
         return this;
@@ -424,7 +422,7 @@ public GetUserListRequest withUsername(Optional<? extends java.util.List<String>
      * Accepts up to 100 web3 wallet addresses.
      * Any web3 wallet addressed not found are ignored.
      */
-    public GetUserListRequest withWeb3Wallet(java.util.List<String> web3Wallet) {
+    public GetUserListRequest withWeb3Wallet(List<String> web3Wallet) {
         Utils.checkNotNull(web3Wallet, "web3Wallet");
         this.web3Wallet = Optional.ofNullable(web3Wallet);
         return this;
@@ -435,7 +433,7 @@ public GetUserListRequest withWeb3Wallet(java.util.List<String> web3Wallet) {
      * Accepts up to 100 web3 wallet addresses.
      * Any web3 wallet addressed not found are ignored.
      */
-    public GetUserListRequest withWeb3Wallet(Optional<? extends java.util.List<String>> web3Wallet) {
+    public GetUserListRequest withWeb3Wallet(Optional<? extends List<String>> web3Wallet) {
         Utils.checkNotNull(web3Wallet, "web3Wallet");
         this.web3Wallet = web3Wallet;
         return this;
@@ -450,7 +448,7 @@ public GetUserListRequest withWeb3Wallet(Optional<? extends java.util.List<Strin
      * Accepts up to 100 user ids.
      * Any user ids not found are ignored.
      */
-    public GetUserListRequest withUserId(java.util.List<String> userId) {
+    public GetUserListRequest withUserId(List<String> userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = Optional.ofNullable(userId);
         return this;
@@ -465,7 +463,7 @@ public GetUserListRequest withUserId(java.util.List<String> userId) {
      * Accepts up to 100 user ids.
      * Any user ids not found are ignored.
      */
-    public GetUserListRequest withUserId(Optional<? extends java.util.List<String>> userId) {
+    public GetUserListRequest withUserId(Optional<? extends List<String>> userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
@@ -480,7 +478,7 @@ public GetUserListRequest withUserId(Optional<? extends java.util.List<String>>
      * excluded from the result set.
      * Accepts up to 100 organization ids.
      */
-    public GetUserListRequest withOrganizationId(java.util.List<String> organizationId) {
+    public GetUserListRequest withOrganizationId(List<String> organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = Optional.ofNullable(organizationId);
         return this;
@@ -495,7 +493,7 @@ public GetUserListRequest withOrganizationId(java.util.List<String> organization
      * excluded from the result set.
      * Accepts up to 100 organization ids.
      */
-    public GetUserListRequest withOrganizationId(Optional<? extends java.util.List<String>> organizationId) {
+    public GetUserListRequest withOrganizationId(Optional<? extends List<String>> organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
@@ -517,7 +515,7 @@ public GetUserListRequest withQuery(String query) {
      * For possible matches, we check the email addresses, phone numbers, usernames, web3 wallets, user ids, first and last names.
      * The query value doesn't need to match the exact value you are looking for, it is capable of partial matches as well.
      */
-    public GetUserListRequest withQuery(Optional<? extends String> query) {
+    public GetUserListRequest withQuery(Optional<String> query) {
         Utils.checkNotNull(query, "query");
         this.query = query;
         return this;
@@ -539,7 +537,7 @@ public GetUserListRequest withLastActiveAtSince(long lastActiveAtSince) {
      * Providing a value with higher precision than day will result in an error.
      * Example: use 1700690400000 to retrieve users that had session activity from 2023-11-23 until the current day.
      */
-    public GetUserListRequest withLastActiveAtSince(Optional<? extends Long> lastActiveAtSince) {
+    public GetUserListRequest withLastActiveAtSince(Optional<Long> lastActiveAtSince) {
         Utils.checkNotNull(lastActiveAtSince, "lastActiveAtSince");
         this.lastActiveAtSince = lastActiveAtSince;
         return this;
@@ -559,7 +557,7 @@ public GetUserListRequest withLimit(long limit) {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    public GetUserListRequest withLimit(Optional<? extends Long> limit) {
+    public GetUserListRequest withLimit(Optional<Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -581,7 +579,7 @@ public GetUserListRequest withOffset(long offset) {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    public GetUserListRequest withOffset(Optional<? extends Long> offset) {
+    public GetUserListRequest withOffset(Optional<Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -609,7 +607,7 @@ public GetUserListRequest withOrderBy(String orderBy) {
      * If you don't use `+` or `-`, then `+` is implied. We only support one `order_by` parameter, and if multiple `order_by` parameters are provided, we will only keep the first one. For example,
      * if you pass `order_by=username&amp;order_by=created_at`, we will consider only the first `order_by` parameter, which is `username`. The `created_at` parameter will be ignored in this case.
      */
-    public GetUserListRequest withOrderBy(Optional<? extends String> orderBy) {
+    public GetUserListRequest withOrderBy(Optional<String> orderBy) {
         Utils.checkNotNull(orderBy, "orderBy");
         this.orderBy = orderBy;
         return this;
@@ -625,23 +623,23 @@ public boolean equals(java.lang.Object o) {
         }
         GetUserListRequest other = (GetUserListRequest) o;
         return 
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.phoneNumber, other.phoneNumber) &&
-            java.util.Objects.deepEquals(this.externalId, other.externalId) &&
-            java.util.Objects.deepEquals(this.username, other.username) &&
-            java.util.Objects.deepEquals(this.web3Wallet, other.web3Wallet) &&
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.query, other.query) &&
-            java.util.Objects.deepEquals(this.lastActiveAtSince, other.lastActiveAtSince) &&
-            java.util.Objects.deepEquals(this.limit, other.limit) &&
-            java.util.Objects.deepEquals(this.offset, other.offset) &&
-            java.util.Objects.deepEquals(this.orderBy, other.orderBy);
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.phoneNumber, other.phoneNumber) &&
+            Objects.deepEquals(this.externalId, other.externalId) &&
+            Objects.deepEquals(this.username, other.username) &&
+            Objects.deepEquals(this.web3Wallet, other.web3Wallet) &&
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.query, other.query) &&
+            Objects.deepEquals(this.lastActiveAtSince, other.lastActiveAtSince) &&
+            Objects.deepEquals(this.limit, other.limit) &&
+            Objects.deepEquals(this.offset, other.offset) &&
+            Objects.deepEquals(this.orderBy, other.orderBy);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             emailAddress,
             phoneNumber,
             externalId,
@@ -675,29 +673,29 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends java.util.List<String>> emailAddress = Optional.empty();
+        private Optional<? extends List<String>> emailAddress = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> phoneNumber = Optional.empty();
+        private Optional<? extends List<String>> phoneNumber = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> externalId = Optional.empty();
+        private Optional<? extends List<String>> externalId = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> username = Optional.empty();
+        private Optional<? extends List<String>> username = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> web3Wallet = Optional.empty();
+        private Optional<? extends List<String>> web3Wallet = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> userId = Optional.empty();
+        private Optional<? extends List<String>> userId = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> organizationId = Optional.empty();
+        private Optional<? extends List<String>> organizationId = Optional.empty();
  
-        private Optional<? extends String> query = Optional.empty();
+        private Optional<String> query = Optional.empty();
  
-        private Optional<? extends Long> lastActiveAtSince = Optional.empty();
+        private Optional<Long> lastActiveAtSince = Optional.empty();
  
-        private Optional<? extends Long> limit;
+        private Optional<Long> limit;
  
-        private Optional<? extends Long> offset;
+        private Optional<Long> offset;
  
-        private Optional<? extends String> orderBy;  
+        private Optional<String> orderBy;  
         
         private Builder() {
           // force use of static builder() method
@@ -708,7 +706,7 @@ private Builder() {
          * Accepts up to 100 email addresses.
          * Any email addresses not found are ignored.
          */
-        public Builder emailAddress(java.util.List<String> emailAddress) {
+        public Builder emailAddress(List<String> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = Optional.ofNullable(emailAddress);
             return this;
@@ -719,7 +717,7 @@ public Builder emailAddress(java.util.List<String> emailAddress) {
          * Accepts up to 100 email addresses.
          * Any email addresses not found are ignored.
          */
-        public Builder emailAddress(Optional<? extends java.util.List<String>> emailAddress) {
+        public Builder emailAddress(Optional<? extends List<String>> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = emailAddress;
             return this;
@@ -730,7 +728,7 @@ public Builder emailAddress(Optional<? extends java.util.List<String>> emailAddr
          * Accepts up to 100 phone numbers.
          * Any phone numbers not found are ignored.
          */
-        public Builder phoneNumber(java.util.List<String> phoneNumber) {
+        public Builder phoneNumber(List<String> phoneNumber) {
             Utils.checkNotNull(phoneNumber, "phoneNumber");
             this.phoneNumber = Optional.ofNullable(phoneNumber);
             return this;
@@ -741,7 +739,7 @@ public Builder phoneNumber(java.util.List<String> phoneNumber) {
          * Accepts up to 100 phone numbers.
          * Any phone numbers not found are ignored.
          */
-        public Builder phoneNumber(Optional<? extends java.util.List<String>> phoneNumber) {
+        public Builder phoneNumber(Optional<? extends List<String>> phoneNumber) {
             Utils.checkNotNull(phoneNumber, "phoneNumber");
             this.phoneNumber = phoneNumber;
             return this;
@@ -756,7 +754,7 @@ public Builder phoneNumber(Optional<? extends java.util.List<String>> phoneNumbe
          * Accepts up to 100 external ids.
          * Any external ids not found are ignored.
          */
-        public Builder externalId(java.util.List<String> externalId) {
+        public Builder externalId(List<String> externalId) {
             Utils.checkNotNull(externalId, "externalId");
             this.externalId = Optional.ofNullable(externalId);
             return this;
@@ -771,7 +769,7 @@ public Builder externalId(java.util.List<String> externalId) {
          * Accepts up to 100 external ids.
          * Any external ids not found are ignored.
          */
-        public Builder externalId(Optional<? extends java.util.List<String>> externalId) {
+        public Builder externalId(Optional<? extends List<String>> externalId) {
             Utils.checkNotNull(externalId, "externalId");
             this.externalId = externalId;
             return this;
@@ -782,7 +780,7 @@ public Builder externalId(Optional<? extends java.util.List<String>> externalId)
          * Accepts up to 100 usernames.
          * Any usernames not found are ignored.
          */
-        public Builder username(java.util.List<String> username) {
+        public Builder username(List<String> username) {
             Utils.checkNotNull(username, "username");
             this.username = Optional.ofNullable(username);
             return this;
@@ -793,7 +791,7 @@ public Builder username(java.util.List<String> username) {
          * Accepts up to 100 usernames.
          * Any usernames not found are ignored.
          */
-        public Builder username(Optional<? extends java.util.List<String>> username) {
+        public Builder username(Optional<? extends List<String>> username) {
             Utils.checkNotNull(username, "username");
             this.username = username;
             return this;
@@ -804,7 +802,7 @@ public Builder username(Optional<? extends java.util.List<String>> username) {
          * Accepts up to 100 web3 wallet addresses.
          * Any web3 wallet addressed not found are ignored.
          */
-        public Builder web3Wallet(java.util.List<String> web3Wallet) {
+        public Builder web3Wallet(List<String> web3Wallet) {
             Utils.checkNotNull(web3Wallet, "web3Wallet");
             this.web3Wallet = Optional.ofNullable(web3Wallet);
             return this;
@@ -815,7 +813,7 @@ public Builder web3Wallet(java.util.List<String> web3Wallet) {
          * Accepts up to 100 web3 wallet addresses.
          * Any web3 wallet addressed not found are ignored.
          */
-        public Builder web3Wallet(Optional<? extends java.util.List<String>> web3Wallet) {
+        public Builder web3Wallet(Optional<? extends List<String>> web3Wallet) {
             Utils.checkNotNull(web3Wallet, "web3Wallet");
             this.web3Wallet = web3Wallet;
             return this;
@@ -830,7 +828,7 @@ public Builder web3Wallet(Optional<? extends java.util.List<String>> web3Wallet)
          * Accepts up to 100 user ids.
          * Any user ids not found are ignored.
          */
-        public Builder userId(java.util.List<String> userId) {
+        public Builder userId(List<String> userId) {
             Utils.checkNotNull(userId, "userId");
             this.userId = Optional.ofNullable(userId);
             return this;
@@ -845,7 +843,7 @@ public Builder userId(java.util.List<String> userId) {
          * Accepts up to 100 user ids.
          * Any user ids not found are ignored.
          */
-        public Builder userId(Optional<? extends java.util.List<String>> userId) {
+        public Builder userId(Optional<? extends List<String>> userId) {
             Utils.checkNotNull(userId, "userId");
             this.userId = userId;
             return this;
@@ -860,7 +858,7 @@ public Builder userId(Optional<? extends java.util.List<String>> userId) {
          * excluded from the result set.
          * Accepts up to 100 organization ids.
          */
-        public Builder organizationId(java.util.List<String> organizationId) {
+        public Builder organizationId(List<String> organizationId) {
             Utils.checkNotNull(organizationId, "organizationId");
             this.organizationId = Optional.ofNullable(organizationId);
             return this;
@@ -875,7 +873,7 @@ public Builder organizationId(java.util.List<String> organizationId) {
          * excluded from the result set.
          * Accepts up to 100 organization ids.
          */
-        public Builder organizationId(Optional<? extends java.util.List<String>> organizationId) {
+        public Builder organizationId(Optional<? extends List<String>> organizationId) {
             Utils.checkNotNull(organizationId, "organizationId");
             this.organizationId = organizationId;
             return this;
@@ -897,7 +895,7 @@ public Builder query(String query) {
          * For possible matches, we check the email addresses, phone numbers, usernames, web3 wallets, user ids, first and last names.
          * The query value doesn't need to match the exact value you are looking for, it is capable of partial matches as well.
          */
-        public Builder query(Optional<? extends String> query) {
+        public Builder query(Optional<String> query) {
             Utils.checkNotNull(query, "query");
             this.query = query;
             return this;
@@ -919,7 +917,7 @@ public Builder lastActiveAtSince(long lastActiveAtSince) {
          * Providing a value with higher precision than day will result in an error.
          * Example: use 1700690400000 to retrieve users that had session activity from 2023-11-23 until the current day.
          */
-        public Builder lastActiveAtSince(Optional<? extends Long> lastActiveAtSince) {
+        public Builder lastActiveAtSince(Optional<Long> lastActiveAtSince) {
             Utils.checkNotNull(lastActiveAtSince, "lastActiveAtSince");
             this.lastActiveAtSince = lastActiveAtSince;
             return this;
@@ -939,7 +937,7 @@ public Builder limit(long limit) {
          * Applies a limit to the number of results returned.
          * Can be used for paginating the results together with `offset`.
          */
-        public Builder limit(Optional<? extends Long> limit) {
+        public Builder limit(Optional<Long> limit) {
             Utils.checkNotNull(limit, "limit");
             this.limit = limit;
             return this;
@@ -961,7 +959,7 @@ public Builder offset(long offset) {
          * Needs to be an integer greater or equal to zero.
          * To be used in conjunction with `limit`.
          */
-        public Builder offset(Optional<? extends Long> offset) {
+        public Builder offset(Optional<Long> offset) {
             Utils.checkNotNull(offset, "offset");
             this.offset = offset;
             return this;
@@ -989,7 +987,7 @@ public Builder orderBy(String orderBy) {
          * If you don't use `+` or `-`, then `+` is implied. We only support one `order_by` parameter, and if multiple `order_by` parameters are provided, we will only keep the first one. For example,
          * if you pass `order_by=username&amp;order_by=created_at`, we will consider only the first `order_by` parameter, which is `username`. The `created_at` parameter will be ignored in this case.
          */
-        public Builder orderBy(Optional<? extends String> orderBy) {
+        public Builder orderBy(Optional<String> orderBy) {
             Utils.checkNotNull(orderBy, "orderBy");
             this.orderBy = orderBy;
             return this;
@@ -1020,23 +1018,23 @@ public GetUserListRequest build() {
                 orderBy);
         }
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
                 new LazySingletonValue<>(
                         "limit",
                         "10",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
                 new LazySingletonValue<>(
                         "offset",
                         "0",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
 
-        private static final LazySingletonValue<Optional<? extends String>> _SINGLETON_VALUE_OrderBy =
+        private static final LazySingletonValue<Optional<String>> _SINGLETON_VALUE_OrderBy =
                 new LazySingletonValue<>(
                         "order_by",
                         "\"-created_at\"",
-                        new TypeReference<Optional<? extends String>>() {});
+                        new TypeReference<Optional<String>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetUserListRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetUserListRequestBuilder.java
index 25f1d1c..b4bbe87 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetUserListRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetUserListRequestBuilder.java
@@ -4,18 +4,7 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class GetUserListRequestBuilder {
 
@@ -26,7 +15,7 @@ public GetUserListRequestBuilder(SDKMethodInterfaces.MethodCallGetUserList sdk)
         this.sdk = sdk;
     }
 
-    public GetUserListRequestBuilder request(GetUserListRequest request) {
+    public GetUserListRequestBuilder request(com.clerk.backend_api.models.operations.GetUserListRequest request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetUserListResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetUserListResponse.java
index 234fc2c..691ec87 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetUserListResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetUserListResponse.java
@@ -4,19 +4,24 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.User;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetUserListResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetUserListResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +41,14 @@ public class GetUserListResponse implements com.clerk.backend_api.utils.Response
     /**
      * Success
      */
-    private Optional<? extends java.util.List<com.clerk.backend_api.models.components.User>> userList;
+    private Optional<? extends List<User>> userList;
 
     @JsonCreator
     public GetUserListResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends java.util.List<com.clerk.backend_api.models.components.User>> userList) {
+            Optional<? extends List<User>> userList) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +95,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<com.clerk.backend_api.models.components.User>> userList() {
-        return (Optional<java.util.List<com.clerk.backend_api.models.components.User>>) userList;
+    public Optional<List<User>> userList() {
+        return (Optional<List<User>>) userList;
     }
 
     public final static Builder builder() {
@@ -128,7 +133,7 @@ public GetUserListResponse withRawResponse(HttpResponse<InputStream> rawResponse
     /**
      * Success
      */
-    public GetUserListResponse withUserList(java.util.List<com.clerk.backend_api.models.components.User> userList) {
+    public GetUserListResponse withUserList(List<User> userList) {
         Utils.checkNotNull(userList, "userList");
         this.userList = Optional.ofNullable(userList);
         return this;
@@ -137,7 +142,7 @@ public GetUserListResponse withUserList(java.util.List<com.clerk.backend_api.mod
     /**
      * Success
      */
-    public GetUserListResponse withUserList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.User>> userList) {
+    public GetUserListResponse withUserList(Optional<? extends List<User>> userList) {
         Utils.checkNotNull(userList, "userList");
         this.userList = userList;
         return this;
@@ -153,15 +158,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetUserListResponse other = (GetUserListResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.userList, other.userList);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.userList, other.userList);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +190,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends java.util.List<com.clerk.backend_api.models.components.User>> userList = Optional.empty();  
+        private Optional<? extends List<User>> userList = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +226,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder userList(java.util.List<com.clerk.backend_api.models.components.User> userList) {
+        public Builder userList(List<User> userList) {
             Utils.checkNotNull(userList, "userList");
             this.userList = Optional.ofNullable(userList);
             return this;
@@ -230,7 +235,7 @@ public Builder userList(java.util.List<com.clerk.backend_api.models.components.U
         /**
          * Success
          */
-        public Builder userList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.User>> userList) {
+        public Builder userList(Optional<? extends List<User>> userList) {
             Utils.checkNotNull(userList, "userList");
             this.userList = userList;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetUserRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetUserRequest.java
index f8bbf42..03d07e9 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetUserRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetUserRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class GetUserRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         GetUserRequest other = (GetUserRequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId);
+            Objects.deepEquals(this.userId, other.userId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetUserRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetUserRequestBuilder.java
index c977efc..77c0a03 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetUserRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetUserRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class GetUserRequestBuilder {
 
@@ -26,7 +16,7 @@ public GetUserRequestBuilder(SDKMethodInterfaces.MethodCallGetUser sdk) {
         this.sdk = sdk;
     }
 
-    public GetUserRequestBuilder userId(String userId) {
+    public GetUserRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetUserResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetUserResponse.java
index 300a86c..41a83c6 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetUserResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetUserResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.User;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetUserResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetUserResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GetUserResponse implements com.clerk.backend_api.utils.Response {
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.User> user;
+    private Optional<? extends User> user;
 
     @JsonCreator
     public GetUserResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.User> user) {
+            Optional<? extends User> user) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.User> user() {
-        return (Optional<com.clerk.backend_api.models.components.User>) user;
+    public Optional<User> user() {
+        return (Optional<User>) user;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GetUserResponse withRawResponse(HttpResponse<InputStream> rawResponse) {
     /**
      * Success
      */
-    public GetUserResponse withUser(com.clerk.backend_api.models.components.User user) {
+    public GetUserResponse withUser(User user) {
         Utils.checkNotNull(user, "user");
         this.user = Optional.ofNullable(user);
         return this;
@@ -137,7 +141,7 @@ public GetUserResponse withUser(com.clerk.backend_api.models.components.User use
     /**
      * Success
      */
-    public GetUserResponse withUser(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+    public GetUserResponse withUser(Optional<? extends User> user) {
         Utils.checkNotNull(user, "user");
         this.user = user;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetUserResponse other = (GetUserResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.user, other.user);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.user, other.user);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.User> user = Optional.empty();  
+        private Optional<? extends User> user = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder user(com.clerk.backend_api.models.components.User user) {
+        public Builder user(User user) {
             Utils.checkNotNull(user, "user");
             this.user = Optional.ofNullable(user);
             return this;
@@ -230,7 +234,7 @@ public Builder user(com.clerk.backend_api.models.components.User user) {
         /**
          * Success
          */
-        public Builder user(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+        public Builder user(Optional<? extends User> user) {
             Utils.checkNotNull(user, "user");
             this.user = user;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetUsersCountRequest.java b/src/main/java/com/clerk/backend_api/models/operations/GetUsersCountRequest.java
index 0536b6c..e90b776 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetUsersCountRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetUsersCountRequest.java
@@ -4,18 +4,19 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class GetUsersCountRequest {
 
     /**
@@ -24,7 +25,7 @@ public class GetUsersCountRequest {
      * Any email addresses not found are ignored.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=email_address")
-    private Optional<? extends java.util.List<String>> emailAddress;
+    private Optional<? extends List<String>> emailAddress;
 
     /**
      * Counts users with the specified phone numbers.
@@ -32,7 +33,7 @@ public class GetUsersCountRequest {
      * Any phone numbers not found are ignored.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=phone_number")
-    private Optional<? extends java.util.List<String>> phoneNumber;
+    private Optional<? extends List<String>> phoneNumber;
 
     /**
      * Counts users with the specified external ids.
@@ -40,7 +41,7 @@ public class GetUsersCountRequest {
      * Any external ids not found are ignored.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=external_id")
-    private Optional<? extends java.util.List<String>> externalId;
+    private Optional<? extends List<String>> externalId;
 
     /**
      * Counts users with the specified usernames.
@@ -48,7 +49,7 @@ public class GetUsersCountRequest {
      * Any usernames not found are ignored.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=username")
-    private Optional<? extends java.util.List<String>> username;
+    private Optional<? extends List<String>> username;
 
     /**
      * Counts users with the specified web3 wallet addresses.
@@ -56,7 +57,7 @@ public class GetUsersCountRequest {
      * Any web3 wallet addressed not found are ignored.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=web3_wallet")
-    private Optional<? extends java.util.List<String>> web3Wallet;
+    private Optional<? extends List<String>> web3Wallet;
 
     /**
      * Counts users with the user ids specified.
@@ -64,7 +65,7 @@ public class GetUsersCountRequest {
      * Any user ids not found are ignored.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=user_id")
-    private Optional<? extends java.util.List<String>> userId;
+    private Optional<? extends List<String>> userId;
 
     /**
      * Counts users that match the given query.
@@ -72,17 +73,17 @@ public class GetUsersCountRequest {
      * The query value doesn't need to match the exact value you are looking for, it is capable of partial matches as well.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=query")
-    private Optional<? extends String> query;
+    private Optional<String> query;
 
     @JsonCreator
     public GetUsersCountRequest(
-            Optional<? extends java.util.List<String>> emailAddress,
-            Optional<? extends java.util.List<String>> phoneNumber,
-            Optional<? extends java.util.List<String>> externalId,
-            Optional<? extends java.util.List<String>> username,
-            Optional<? extends java.util.List<String>> web3Wallet,
-            Optional<? extends java.util.List<String>> userId,
-            Optional<? extends String> query) {
+            Optional<? extends List<String>> emailAddress,
+            Optional<? extends List<String>> phoneNumber,
+            Optional<? extends List<String>> externalId,
+            Optional<? extends List<String>> username,
+            Optional<? extends List<String>> web3Wallet,
+            Optional<? extends List<String>> userId,
+            Optional<String> query) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         Utils.checkNotNull(externalId, "externalId");
@@ -110,8 +111,8 @@ public GetUsersCountRequest() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> emailAddress() {
-        return (Optional<java.util.List<String>>) emailAddress;
+    public Optional<List<String>> emailAddress() {
+        return (Optional<List<String>>) emailAddress;
     }
 
     /**
@@ -121,8 +122,8 @@ public Optional<java.util.List<String>> emailAddress() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> phoneNumber() {
-        return (Optional<java.util.List<String>>) phoneNumber;
+    public Optional<List<String>> phoneNumber() {
+        return (Optional<List<String>>) phoneNumber;
     }
 
     /**
@@ -132,8 +133,8 @@ public Optional<java.util.List<String>> phoneNumber() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> externalId() {
-        return (Optional<java.util.List<String>>) externalId;
+    public Optional<List<String>> externalId() {
+        return (Optional<List<String>>) externalId;
     }
 
     /**
@@ -143,8 +144,8 @@ public Optional<java.util.List<String>> externalId() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> username() {
-        return (Optional<java.util.List<String>>) username;
+    public Optional<List<String>> username() {
+        return (Optional<List<String>>) username;
     }
 
     /**
@@ -154,8 +155,8 @@ public Optional<java.util.List<String>> username() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> web3Wallet() {
-        return (Optional<java.util.List<String>>) web3Wallet;
+    public Optional<List<String>> web3Wallet() {
+        return (Optional<List<String>>) web3Wallet;
     }
 
     /**
@@ -165,8 +166,8 @@ public Optional<java.util.List<String>> web3Wallet() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> userId() {
-        return (Optional<java.util.List<String>>) userId;
+    public Optional<List<String>> userId() {
+        return (Optional<List<String>>) userId;
     }
 
     /**
@@ -174,10 +175,9 @@ public Optional<java.util.List<String>> userId() {
      * For possible matches, we check the email addresses, phone numbers, usernames, web3 wallets, user ids, first and last names.
      * The query value doesn't need to match the exact value you are looking for, it is capable of partial matches as well.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> query() {
-        return (Optional<String>) query;
+        return query;
     }
 
     public final static Builder builder() {
@@ -189,7 +189,7 @@ public final static Builder builder() {
      * Accepts up to 100 email addresses.
      * Any email addresses not found are ignored.
      */
-    public GetUsersCountRequest withEmailAddress(java.util.List<String> emailAddress) {
+    public GetUsersCountRequest withEmailAddress(List<String> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = Optional.ofNullable(emailAddress);
         return this;
@@ -200,7 +200,7 @@ public GetUsersCountRequest withEmailAddress(java.util.List<String> emailAddress
      * Accepts up to 100 email addresses.
      * Any email addresses not found are ignored.
      */
-    public GetUsersCountRequest withEmailAddress(Optional<? extends java.util.List<String>> emailAddress) {
+    public GetUsersCountRequest withEmailAddress(Optional<? extends List<String>> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = emailAddress;
         return this;
@@ -211,7 +211,7 @@ public GetUsersCountRequest withEmailAddress(Optional<? extends java.util.List<S
      * Accepts up to 100 phone numbers.
      * Any phone numbers not found are ignored.
      */
-    public GetUsersCountRequest withPhoneNumber(java.util.List<String> phoneNumber) {
+    public GetUsersCountRequest withPhoneNumber(List<String> phoneNumber) {
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         this.phoneNumber = Optional.ofNullable(phoneNumber);
         return this;
@@ -222,7 +222,7 @@ public GetUsersCountRequest withPhoneNumber(java.util.List<String> phoneNumber)
      * Accepts up to 100 phone numbers.
      * Any phone numbers not found are ignored.
      */
-    public GetUsersCountRequest withPhoneNumber(Optional<? extends java.util.List<String>> phoneNumber) {
+    public GetUsersCountRequest withPhoneNumber(Optional<? extends List<String>> phoneNumber) {
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         this.phoneNumber = phoneNumber;
         return this;
@@ -233,7 +233,7 @@ public GetUsersCountRequest withPhoneNumber(Optional<? extends java.util.List<St
      * Accepts up to 100 external ids.
      * Any external ids not found are ignored.
      */
-    public GetUsersCountRequest withExternalId(java.util.List<String> externalId) {
+    public GetUsersCountRequest withExternalId(List<String> externalId) {
         Utils.checkNotNull(externalId, "externalId");
         this.externalId = Optional.ofNullable(externalId);
         return this;
@@ -244,7 +244,7 @@ public GetUsersCountRequest withExternalId(java.util.List<String> externalId) {
      * Accepts up to 100 external ids.
      * Any external ids not found are ignored.
      */
-    public GetUsersCountRequest withExternalId(Optional<? extends java.util.List<String>> externalId) {
+    public GetUsersCountRequest withExternalId(Optional<? extends List<String>> externalId) {
         Utils.checkNotNull(externalId, "externalId");
         this.externalId = externalId;
         return this;
@@ -255,7 +255,7 @@ public GetUsersCountRequest withExternalId(Optional<? extends java.util.List<Str
      * Accepts up to 100 usernames.
      * Any usernames not found are ignored.
      */
-    public GetUsersCountRequest withUsername(java.util.List<String> username) {
+    public GetUsersCountRequest withUsername(List<String> username) {
         Utils.checkNotNull(username, "username");
         this.username = Optional.ofNullable(username);
         return this;
@@ -266,7 +266,7 @@ public GetUsersCountRequest withUsername(java.util.List<String> username) {
      * Accepts up to 100 usernames.
      * Any usernames not found are ignored.
      */
-    public GetUsersCountRequest withUsername(Optional<? extends java.util.List<String>> username) {
+    public GetUsersCountRequest withUsername(Optional<? extends List<String>> username) {
         Utils.checkNotNull(username, "username");
         this.username = username;
         return this;
@@ -277,7 +277,7 @@ public GetUsersCountRequest withUsername(Optional<? extends java.util.List<Strin
      * Accepts up to 100 web3 wallet addresses.
      * Any web3 wallet addressed not found are ignored.
      */
-    public GetUsersCountRequest withWeb3Wallet(java.util.List<String> web3Wallet) {
+    public GetUsersCountRequest withWeb3Wallet(List<String> web3Wallet) {
         Utils.checkNotNull(web3Wallet, "web3Wallet");
         this.web3Wallet = Optional.ofNullable(web3Wallet);
         return this;
@@ -288,7 +288,7 @@ public GetUsersCountRequest withWeb3Wallet(java.util.List<String> web3Wallet) {
      * Accepts up to 100 web3 wallet addresses.
      * Any web3 wallet addressed not found are ignored.
      */
-    public GetUsersCountRequest withWeb3Wallet(Optional<? extends java.util.List<String>> web3Wallet) {
+    public GetUsersCountRequest withWeb3Wallet(Optional<? extends List<String>> web3Wallet) {
         Utils.checkNotNull(web3Wallet, "web3Wallet");
         this.web3Wallet = web3Wallet;
         return this;
@@ -299,7 +299,7 @@ public GetUsersCountRequest withWeb3Wallet(Optional<? extends java.util.List<Str
      * Accepts up to 100 user ids.
      * Any user ids not found are ignored.
      */
-    public GetUsersCountRequest withUserId(java.util.List<String> userId) {
+    public GetUsersCountRequest withUserId(List<String> userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = Optional.ofNullable(userId);
         return this;
@@ -310,7 +310,7 @@ public GetUsersCountRequest withUserId(java.util.List<String> userId) {
      * Accepts up to 100 user ids.
      * Any user ids not found are ignored.
      */
-    public GetUsersCountRequest withUserId(Optional<? extends java.util.List<String>> userId) {
+    public GetUsersCountRequest withUserId(Optional<? extends List<String>> userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
@@ -332,7 +332,7 @@ public GetUsersCountRequest withQuery(String query) {
      * For possible matches, we check the email addresses, phone numbers, usernames, web3 wallets, user ids, first and last names.
      * The query value doesn't need to match the exact value you are looking for, it is capable of partial matches as well.
      */
-    public GetUsersCountRequest withQuery(Optional<? extends String> query) {
+    public GetUsersCountRequest withQuery(Optional<String> query) {
         Utils.checkNotNull(query, "query");
         this.query = query;
         return this;
@@ -348,18 +348,18 @@ public boolean equals(java.lang.Object o) {
         }
         GetUsersCountRequest other = (GetUsersCountRequest) o;
         return 
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.phoneNumber, other.phoneNumber) &&
-            java.util.Objects.deepEquals(this.externalId, other.externalId) &&
-            java.util.Objects.deepEquals(this.username, other.username) &&
-            java.util.Objects.deepEquals(this.web3Wallet, other.web3Wallet) &&
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.query, other.query);
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.phoneNumber, other.phoneNumber) &&
+            Objects.deepEquals(this.externalId, other.externalId) &&
+            Objects.deepEquals(this.username, other.username) &&
+            Objects.deepEquals(this.web3Wallet, other.web3Wallet) &&
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.query, other.query);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             emailAddress,
             phoneNumber,
             externalId,
@@ -383,19 +383,19 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends java.util.List<String>> emailAddress = Optional.empty();
+        private Optional<? extends List<String>> emailAddress = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> phoneNumber = Optional.empty();
+        private Optional<? extends List<String>> phoneNumber = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> externalId = Optional.empty();
+        private Optional<? extends List<String>> externalId = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> username = Optional.empty();
+        private Optional<? extends List<String>> username = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> web3Wallet = Optional.empty();
+        private Optional<? extends List<String>> web3Wallet = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> userId = Optional.empty();
+        private Optional<? extends List<String>> userId = Optional.empty();
  
-        private Optional<? extends String> query = Optional.empty();  
+        private Optional<String> query = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -406,7 +406,7 @@ private Builder() {
          * Accepts up to 100 email addresses.
          * Any email addresses not found are ignored.
          */
-        public Builder emailAddress(java.util.List<String> emailAddress) {
+        public Builder emailAddress(List<String> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = Optional.ofNullable(emailAddress);
             return this;
@@ -417,7 +417,7 @@ public Builder emailAddress(java.util.List<String> emailAddress) {
          * Accepts up to 100 email addresses.
          * Any email addresses not found are ignored.
          */
-        public Builder emailAddress(Optional<? extends java.util.List<String>> emailAddress) {
+        public Builder emailAddress(Optional<? extends List<String>> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = emailAddress;
             return this;
@@ -428,7 +428,7 @@ public Builder emailAddress(Optional<? extends java.util.List<String>> emailAddr
          * Accepts up to 100 phone numbers.
          * Any phone numbers not found are ignored.
          */
-        public Builder phoneNumber(java.util.List<String> phoneNumber) {
+        public Builder phoneNumber(List<String> phoneNumber) {
             Utils.checkNotNull(phoneNumber, "phoneNumber");
             this.phoneNumber = Optional.ofNullable(phoneNumber);
             return this;
@@ -439,7 +439,7 @@ public Builder phoneNumber(java.util.List<String> phoneNumber) {
          * Accepts up to 100 phone numbers.
          * Any phone numbers not found are ignored.
          */
-        public Builder phoneNumber(Optional<? extends java.util.List<String>> phoneNumber) {
+        public Builder phoneNumber(Optional<? extends List<String>> phoneNumber) {
             Utils.checkNotNull(phoneNumber, "phoneNumber");
             this.phoneNumber = phoneNumber;
             return this;
@@ -450,7 +450,7 @@ public Builder phoneNumber(Optional<? extends java.util.List<String>> phoneNumbe
          * Accepts up to 100 external ids.
          * Any external ids not found are ignored.
          */
-        public Builder externalId(java.util.List<String> externalId) {
+        public Builder externalId(List<String> externalId) {
             Utils.checkNotNull(externalId, "externalId");
             this.externalId = Optional.ofNullable(externalId);
             return this;
@@ -461,7 +461,7 @@ public Builder externalId(java.util.List<String> externalId) {
          * Accepts up to 100 external ids.
          * Any external ids not found are ignored.
          */
-        public Builder externalId(Optional<? extends java.util.List<String>> externalId) {
+        public Builder externalId(Optional<? extends List<String>> externalId) {
             Utils.checkNotNull(externalId, "externalId");
             this.externalId = externalId;
             return this;
@@ -472,7 +472,7 @@ public Builder externalId(Optional<? extends java.util.List<String>> externalId)
          * Accepts up to 100 usernames.
          * Any usernames not found are ignored.
          */
-        public Builder username(java.util.List<String> username) {
+        public Builder username(List<String> username) {
             Utils.checkNotNull(username, "username");
             this.username = Optional.ofNullable(username);
             return this;
@@ -483,7 +483,7 @@ public Builder username(java.util.List<String> username) {
          * Accepts up to 100 usernames.
          * Any usernames not found are ignored.
          */
-        public Builder username(Optional<? extends java.util.List<String>> username) {
+        public Builder username(Optional<? extends List<String>> username) {
             Utils.checkNotNull(username, "username");
             this.username = username;
             return this;
@@ -494,7 +494,7 @@ public Builder username(Optional<? extends java.util.List<String>> username) {
          * Accepts up to 100 web3 wallet addresses.
          * Any web3 wallet addressed not found are ignored.
          */
-        public Builder web3Wallet(java.util.List<String> web3Wallet) {
+        public Builder web3Wallet(List<String> web3Wallet) {
             Utils.checkNotNull(web3Wallet, "web3Wallet");
             this.web3Wallet = Optional.ofNullable(web3Wallet);
             return this;
@@ -505,7 +505,7 @@ public Builder web3Wallet(java.util.List<String> web3Wallet) {
          * Accepts up to 100 web3 wallet addresses.
          * Any web3 wallet addressed not found are ignored.
          */
-        public Builder web3Wallet(Optional<? extends java.util.List<String>> web3Wallet) {
+        public Builder web3Wallet(Optional<? extends List<String>> web3Wallet) {
             Utils.checkNotNull(web3Wallet, "web3Wallet");
             this.web3Wallet = web3Wallet;
             return this;
@@ -516,7 +516,7 @@ public Builder web3Wallet(Optional<? extends java.util.List<String>> web3Wallet)
          * Accepts up to 100 user ids.
          * Any user ids not found are ignored.
          */
-        public Builder userId(java.util.List<String> userId) {
+        public Builder userId(List<String> userId) {
             Utils.checkNotNull(userId, "userId");
             this.userId = Optional.ofNullable(userId);
             return this;
@@ -527,7 +527,7 @@ public Builder userId(java.util.List<String> userId) {
          * Accepts up to 100 user ids.
          * Any user ids not found are ignored.
          */
-        public Builder userId(Optional<? extends java.util.List<String>> userId) {
+        public Builder userId(Optional<? extends List<String>> userId) {
             Utils.checkNotNull(userId, "userId");
             this.userId = userId;
             return this;
@@ -549,7 +549,7 @@ public Builder query(String query) {
          * For possible matches, we check the email addresses, phone numbers, usernames, web3 wallets, user ids, first and last names.
          * The query value doesn't need to match the exact value you are looking for, it is capable of partial matches as well.
          */
-        public Builder query(Optional<? extends String> query) {
+        public Builder query(Optional<String> query) {
             Utils.checkNotNull(query, "query");
             this.query = query;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetUsersCountRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/GetUsersCountRequestBuilder.java
index 81de18e..f445c43 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetUsersCountRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetUsersCountRequestBuilder.java
@@ -4,18 +4,7 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class GetUsersCountRequestBuilder {
 
@@ -26,7 +15,7 @@ public GetUsersCountRequestBuilder(SDKMethodInterfaces.MethodCallGetUsersCount s
         this.sdk = sdk;
     }
 
-    public GetUsersCountRequestBuilder request(GetUsersCountRequest request) {
+    public GetUsersCountRequestBuilder request(com.clerk.backend_api.models.operations.GetUsersCountRequest request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/GetUsersCountResponse.java b/src/main/java/com/clerk/backend_api/models/operations/GetUsersCountResponse.java
index 87603be..b8d09ce 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/GetUsersCountResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/GetUsersCountResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.TotalCount;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class GetUsersCountResponse implements com.clerk.backend_api.utils.Response {
+
+public class GetUsersCountResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class GetUsersCountResponse implements com.clerk.backend_api.utils.Respon
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.TotalCount> totalCount;
+    private Optional<? extends TotalCount> totalCount;
 
     @JsonCreator
     public GetUsersCountResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.TotalCount> totalCount) {
+            Optional<? extends TotalCount> totalCount) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.TotalCount> totalCount() {
-        return (Optional<com.clerk.backend_api.models.components.TotalCount>) totalCount;
+    public Optional<TotalCount> totalCount() {
+        return (Optional<TotalCount>) totalCount;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public GetUsersCountResponse withRawResponse(HttpResponse<InputStream> rawRespon
     /**
      * Success
      */
-    public GetUsersCountResponse withTotalCount(com.clerk.backend_api.models.components.TotalCount totalCount) {
+    public GetUsersCountResponse withTotalCount(TotalCount totalCount) {
         Utils.checkNotNull(totalCount, "totalCount");
         this.totalCount = Optional.ofNullable(totalCount);
         return this;
@@ -137,7 +141,7 @@ public GetUsersCountResponse withTotalCount(com.clerk.backend_api.models.compone
     /**
      * Success
      */
-    public GetUsersCountResponse withTotalCount(Optional<? extends com.clerk.backend_api.models.components.TotalCount> totalCount) {
+    public GetUsersCountResponse withTotalCount(Optional<? extends TotalCount> totalCount) {
         Utils.checkNotNull(totalCount, "totalCount");
         this.totalCount = totalCount;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         GetUsersCountResponse other = (GetUsersCountResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.totalCount, other.totalCount);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.totalCount, other.totalCount);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.TotalCount> totalCount = Optional.empty();  
+        private Optional<? extends TotalCount> totalCount = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder totalCount(com.clerk.backend_api.models.components.TotalCount totalCount) {
+        public Builder totalCount(TotalCount totalCount) {
             Utils.checkNotNull(totalCount, "totalCount");
             this.totalCount = Optional.ofNullable(totalCount);
             return this;
@@ -230,7 +234,7 @@ public Builder totalCount(com.clerk.backend_api.models.components.TotalCount tot
         /**
          * Success
          */
-        public Builder totalCount(Optional<? extends com.clerk.backend_api.models.components.TotalCount> totalCount) {
+        public Builder totalCount(Optional<? extends TotalCount> totalCount) {
             Utils.checkNotNull(totalCount, "totalCount");
             this.totalCount = totalCount;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListAllowlistIdentifiersRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/ListAllowlistIdentifiersRequestBuilder.java
index 6923dbe..b9fd8b6 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListAllowlistIdentifiersRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListAllowlistIdentifiersRequestBuilder.java
@@ -4,18 +4,6 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class ListAllowlistIdentifiersRequestBuilder {
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListAllowlistIdentifiersResponse.java b/src/main/java/com/clerk/backend_api/models/operations/ListAllowlistIdentifiersResponse.java
index 462f486..43a9608 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListAllowlistIdentifiersResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListAllowlistIdentifiersResponse.java
@@ -4,19 +4,24 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.AllowlistIdentifier;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
-public class ListAllowlistIdentifiersResponse implements com.clerk.backend_api.utils.Response {
+
+public class ListAllowlistIdentifiersResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +41,14 @@ public class ListAllowlistIdentifiersResponse implements com.clerk.backend_api.u
     /**
      * Success
      */
-    private Optional<? extends java.util.List<com.clerk.backend_api.models.components.AllowlistIdentifier>> allowlistIdentifierList;
+    private Optional<? extends List<AllowlistIdentifier>> allowlistIdentifierList;
 
     @JsonCreator
     public ListAllowlistIdentifiersResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends java.util.List<com.clerk.backend_api.models.components.AllowlistIdentifier>> allowlistIdentifierList) {
+            Optional<? extends List<AllowlistIdentifier>> allowlistIdentifierList) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +95,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<com.clerk.backend_api.models.components.AllowlistIdentifier>> allowlistIdentifierList() {
-        return (Optional<java.util.List<com.clerk.backend_api.models.components.AllowlistIdentifier>>) allowlistIdentifierList;
+    public Optional<List<AllowlistIdentifier>> allowlistIdentifierList() {
+        return (Optional<List<AllowlistIdentifier>>) allowlistIdentifierList;
     }
 
     public final static Builder builder() {
@@ -128,7 +133,7 @@ public ListAllowlistIdentifiersResponse withRawResponse(HttpResponse<InputStream
     /**
      * Success
      */
-    public ListAllowlistIdentifiersResponse withAllowlistIdentifierList(java.util.List<com.clerk.backend_api.models.components.AllowlistIdentifier> allowlistIdentifierList) {
+    public ListAllowlistIdentifiersResponse withAllowlistIdentifierList(List<AllowlistIdentifier> allowlistIdentifierList) {
         Utils.checkNotNull(allowlistIdentifierList, "allowlistIdentifierList");
         this.allowlistIdentifierList = Optional.ofNullable(allowlistIdentifierList);
         return this;
@@ -137,7 +142,7 @@ public ListAllowlistIdentifiersResponse withAllowlistIdentifierList(java.util.Li
     /**
      * Success
      */
-    public ListAllowlistIdentifiersResponse withAllowlistIdentifierList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.AllowlistIdentifier>> allowlistIdentifierList) {
+    public ListAllowlistIdentifiersResponse withAllowlistIdentifierList(Optional<? extends List<AllowlistIdentifier>> allowlistIdentifierList) {
         Utils.checkNotNull(allowlistIdentifierList, "allowlistIdentifierList");
         this.allowlistIdentifierList = allowlistIdentifierList;
         return this;
@@ -153,15 +158,15 @@ public boolean equals(java.lang.Object o) {
         }
         ListAllowlistIdentifiersResponse other = (ListAllowlistIdentifiersResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.allowlistIdentifierList, other.allowlistIdentifierList);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.allowlistIdentifierList, other.allowlistIdentifierList);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +190,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends java.util.List<com.clerk.backend_api.models.components.AllowlistIdentifier>> allowlistIdentifierList = Optional.empty();  
+        private Optional<? extends List<AllowlistIdentifier>> allowlistIdentifierList = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +226,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder allowlistIdentifierList(java.util.List<com.clerk.backend_api.models.components.AllowlistIdentifier> allowlistIdentifierList) {
+        public Builder allowlistIdentifierList(List<AllowlistIdentifier> allowlistIdentifierList) {
             Utils.checkNotNull(allowlistIdentifierList, "allowlistIdentifierList");
             this.allowlistIdentifierList = Optional.ofNullable(allowlistIdentifierList);
             return this;
@@ -230,7 +235,7 @@ public Builder allowlistIdentifierList(java.util.List<com.clerk.backend_api.mode
         /**
          * Success
          */
-        public Builder allowlistIdentifierList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.AllowlistIdentifier>> allowlistIdentifierList) {
+        public Builder allowlistIdentifierList(Optional<? extends List<AllowlistIdentifier>> allowlistIdentifierList) {
             Utils.checkNotNull(allowlistIdentifierList, "allowlistIdentifierList");
             this.allowlistIdentifierList = allowlistIdentifierList;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListBlocklistIdentifiersRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/ListBlocklistIdentifiersRequestBuilder.java
index 522c7f4..2be483f 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListBlocklistIdentifiersRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListBlocklistIdentifiersRequestBuilder.java
@@ -4,18 +4,6 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class ListBlocklistIdentifiersRequestBuilder {
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListBlocklistIdentifiersResponse.java b/src/main/java/com/clerk/backend_api/models/operations/ListBlocklistIdentifiersResponse.java
index f8004a1..bbdcf22 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListBlocklistIdentifiersResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListBlocklistIdentifiersResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.BlocklistIdentifiers;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class ListBlocklistIdentifiersResponse implements com.clerk.backend_api.utils.Response {
+
+public class ListBlocklistIdentifiersResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class ListBlocklistIdentifiersResponse implements com.clerk.backend_api.u
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.BlocklistIdentifiers> blocklistIdentifiers;
+    private Optional<? extends BlocklistIdentifiers> blocklistIdentifiers;
 
     @JsonCreator
     public ListBlocklistIdentifiersResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.BlocklistIdentifiers> blocklistIdentifiers) {
+            Optional<? extends BlocklistIdentifiers> blocklistIdentifiers) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.BlocklistIdentifiers> blocklistIdentifiers() {
-        return (Optional<com.clerk.backend_api.models.components.BlocklistIdentifiers>) blocklistIdentifiers;
+    public Optional<BlocklistIdentifiers> blocklistIdentifiers() {
+        return (Optional<BlocklistIdentifiers>) blocklistIdentifiers;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public ListBlocklistIdentifiersResponse withRawResponse(HttpResponse<InputStream
     /**
      * Success
      */
-    public ListBlocklistIdentifiersResponse withBlocklistIdentifiers(com.clerk.backend_api.models.components.BlocklistIdentifiers blocklistIdentifiers) {
+    public ListBlocklistIdentifiersResponse withBlocklistIdentifiers(BlocklistIdentifiers blocklistIdentifiers) {
         Utils.checkNotNull(blocklistIdentifiers, "blocklistIdentifiers");
         this.blocklistIdentifiers = Optional.ofNullable(blocklistIdentifiers);
         return this;
@@ -137,7 +141,7 @@ public ListBlocklistIdentifiersResponse withBlocklistIdentifiers(com.clerk.backe
     /**
      * Success
      */
-    public ListBlocklistIdentifiersResponse withBlocklistIdentifiers(Optional<? extends com.clerk.backend_api.models.components.BlocklistIdentifiers> blocklistIdentifiers) {
+    public ListBlocklistIdentifiersResponse withBlocklistIdentifiers(Optional<? extends BlocklistIdentifiers> blocklistIdentifiers) {
         Utils.checkNotNull(blocklistIdentifiers, "blocklistIdentifiers");
         this.blocklistIdentifiers = blocklistIdentifiers;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         ListBlocklistIdentifiersResponse other = (ListBlocklistIdentifiersResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.blocklistIdentifiers, other.blocklistIdentifiers);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.blocklistIdentifiers, other.blocklistIdentifiers);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.BlocklistIdentifiers> blocklistIdentifiers = Optional.empty();  
+        private Optional<? extends BlocklistIdentifiers> blocklistIdentifiers = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder blocklistIdentifiers(com.clerk.backend_api.models.components.BlocklistIdentifiers blocklistIdentifiers) {
+        public Builder blocklistIdentifiers(BlocklistIdentifiers blocklistIdentifiers) {
             Utils.checkNotNull(blocklistIdentifiers, "blocklistIdentifiers");
             this.blocklistIdentifiers = Optional.ofNullable(blocklistIdentifiers);
             return this;
@@ -230,7 +234,7 @@ public Builder blocklistIdentifiers(com.clerk.backend_api.models.components.Bloc
         /**
          * Success
          */
-        public Builder blocklistIdentifiers(Optional<? extends com.clerk.backend_api.models.components.BlocklistIdentifiers> blocklistIdentifiers) {
+        public Builder blocklistIdentifiers(Optional<? extends BlocklistIdentifiers> blocklistIdentifiers) {
             Utils.checkNotNull(blocklistIdentifiers, "blocklistIdentifiers");
             this.blocklistIdentifiers = blocklistIdentifiers;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListDomainsRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/ListDomainsRequestBuilder.java
index fc5d4c0..afafc14 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListDomainsRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListDomainsRequestBuilder.java
@@ -4,18 +4,6 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class ListDomainsRequestBuilder {
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListDomainsResponse.java b/src/main/java/com/clerk/backend_api/models/operations/ListDomainsResponse.java
index 2baac38..dd2e663 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListDomainsResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListDomainsResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Domains;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class ListDomainsResponse implements com.clerk.backend_api.utils.Response {
+
+public class ListDomainsResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class ListDomainsResponse implements com.clerk.backend_api.utils.Response
     /**
      * A list of domains
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Domains> domains;
+    private Optional<? extends Domains> domains;
 
     @JsonCreator
     public ListDomainsResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Domains> domains) {
+            Optional<? extends Domains> domains) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Domains> domains() {
-        return (Optional<com.clerk.backend_api.models.components.Domains>) domains;
+    public Optional<Domains> domains() {
+        return (Optional<Domains>) domains;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public ListDomainsResponse withRawResponse(HttpResponse<InputStream> rawResponse
     /**
      * A list of domains
      */
-    public ListDomainsResponse withDomains(com.clerk.backend_api.models.components.Domains domains) {
+    public ListDomainsResponse withDomains(Domains domains) {
         Utils.checkNotNull(domains, "domains");
         this.domains = Optional.ofNullable(domains);
         return this;
@@ -137,7 +141,7 @@ public ListDomainsResponse withDomains(com.clerk.backend_api.models.components.D
     /**
      * A list of domains
      */
-    public ListDomainsResponse withDomains(Optional<? extends com.clerk.backend_api.models.components.Domains> domains) {
+    public ListDomainsResponse withDomains(Optional<? extends Domains> domains) {
         Utils.checkNotNull(domains, "domains");
         this.domains = domains;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         ListDomainsResponse other = (ListDomainsResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.domains, other.domains);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.domains, other.domains);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Domains> domains = Optional.empty();  
+        private Optional<? extends Domains> domains = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A list of domains
          */
-        public Builder domains(com.clerk.backend_api.models.components.Domains domains) {
+        public Builder domains(Domains domains) {
             Utils.checkNotNull(domains, "domains");
             this.domains = Optional.ofNullable(domains);
             return this;
@@ -230,7 +234,7 @@ public Builder domains(com.clerk.backend_api.models.components.Domains domains)
         /**
          * A list of domains
          */
-        public Builder domains(Optional<? extends com.clerk.backend_api.models.components.Domains> domains) {
+        public Builder domains(Optional<? extends Domains> domains) {
             Utils.checkNotNull(domains, "domains");
             this.domains = domains;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListInvitationsRequest.java b/src/main/java/com/clerk/backend_api/models/operations/ListInvitationsRequest.java
index 624acd1..c2b397e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListInvitationsRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListInvitationsRequest.java
@@ -4,19 +4,21 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class ListInvitationsRequest {
 
     /**
@@ -24,7 +26,7 @@ public class ListInvitationsRequest {
      * Can be used for paginating the results together with `offset`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=limit")
-    private Optional<? extends Long> limit;
+    private Optional<Long> limit;
 
     /**
      * Skip the first `offset` results when paginating.
@@ -32,7 +34,7 @@ public class ListInvitationsRequest {
      * To be used in conjunction with `limit`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=offset")
-    private Optional<? extends Long> offset;
+    private Optional<Long> offset;
 
     /**
      * Filter invitations based on their status
@@ -42,8 +44,8 @@ public class ListInvitationsRequest {
 
     @JsonCreator
     public ListInvitationsRequest(
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset,
+            Optional<Long> limit,
+            Optional<Long> offset,
             Optional<? extends QueryParamStatus> status) {
         Utils.checkNotNull(limit, "limit");
         Utils.checkNotNull(offset, "offset");
@@ -61,10 +63,9 @@ public ListInvitationsRequest() {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> limit() {
-        return (Optional<Long>) limit;
+        return limit;
     }
 
     /**
@@ -72,10 +73,9 @@ public Optional<Long> limit() {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> offset() {
-        return (Optional<Long>) offset;
+        return offset;
     }
 
     /**
@@ -105,7 +105,7 @@ public ListInvitationsRequest withLimit(long limit) {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    public ListInvitationsRequest withLimit(Optional<? extends Long> limit) {
+    public ListInvitationsRequest withLimit(Optional<Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -127,7 +127,7 @@ public ListInvitationsRequest withOffset(long offset) {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    public ListInvitationsRequest withOffset(Optional<? extends Long> offset) {
+    public ListInvitationsRequest withOffset(Optional<Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -161,14 +161,14 @@ public boolean equals(java.lang.Object o) {
         }
         ListInvitationsRequest other = (ListInvitationsRequest) o;
         return 
-            java.util.Objects.deepEquals(this.limit, other.limit) &&
-            java.util.Objects.deepEquals(this.offset, other.offset) &&
-            java.util.Objects.deepEquals(this.status, other.status);
+            Objects.deepEquals(this.limit, other.limit) &&
+            Objects.deepEquals(this.offset, other.offset) &&
+            Objects.deepEquals(this.status, other.status);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             limit,
             offset,
             status);
@@ -184,9 +184,9 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends Long> limit;
+        private Optional<Long> limit;
  
-        private Optional<? extends Long> offset;
+        private Optional<Long> offset;
  
         private Optional<? extends QueryParamStatus> status = Optional.empty();  
         
@@ -208,7 +208,7 @@ public Builder limit(long limit) {
          * Applies a limit to the number of results returned.
          * Can be used for paginating the results together with `offset`.
          */
-        public Builder limit(Optional<? extends Long> limit) {
+        public Builder limit(Optional<Long> limit) {
             Utils.checkNotNull(limit, "limit");
             this.limit = limit;
             return this;
@@ -230,7 +230,7 @@ public Builder offset(long offset) {
          * Needs to be an integer greater or equal to zero.
          * To be used in conjunction with `limit`.
          */
-        public Builder offset(Optional<? extends Long> offset) {
+        public Builder offset(Optional<Long> offset) {
             Utils.checkNotNull(offset, "offset");
             this.offset = offset;
             return this;
@@ -267,17 +267,17 @@ public ListInvitationsRequest build() {
                 status);
         }
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
                 new LazySingletonValue<>(
                         "limit",
                         "10",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
                 new LazySingletonValue<>(
                         "offset",
                         "0",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListInvitationsRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/ListInvitationsRequestBuilder.java
index a1eee59..bf8c193 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListInvitationsRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListInvitationsRequestBuilder.java
@@ -8,25 +8,20 @@
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.Long;
 import java.util.Optional;
 import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class ListInvitationsRequestBuilder {
 
-    private Optional<? extends Long> limit = Utils.readDefaultOrConstValue(
+    private Optional<Long> limit = Utils.readDefaultOrConstValue(
                             "limit",
                             "10",
-                            new TypeReference<Optional<? extends Long>>() {});
-    private Optional<? extends Long> offset = Utils.readDefaultOrConstValue(
+                            new TypeReference<Optional<Long>>() {});
+    private Optional<Long> offset = Utils.readDefaultOrConstValue(
                             "offset",
                             "0",
-                            new TypeReference<Optional<? extends Long>>() {});
+                            new TypeReference<Optional<Long>>() {});
     private Optional<? extends QueryParamStatus> status = Optional.empty();
     private final SDKMethodInterfaces.MethodCallListInvitations sdk;
 
@@ -40,7 +35,7 @@ public ListInvitationsRequestBuilder limit(long limit) {
         return this;
     }
 
-    public ListInvitationsRequestBuilder limit(Optional<? extends Long> limit) {
+    public ListInvitationsRequestBuilder limit(java.util.Optional<java.lang.Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -52,19 +47,19 @@ public ListInvitationsRequestBuilder offset(long offset) {
         return this;
     }
 
-    public ListInvitationsRequestBuilder offset(Optional<? extends Long> offset) {
+    public ListInvitationsRequestBuilder offset(java.util.Optional<java.lang.Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
     }
                 
-    public ListInvitationsRequestBuilder status(QueryParamStatus status) {
+    public ListInvitationsRequestBuilder status(com.clerk.backend_api.models.operations.QueryParamStatus status) {
         Utils.checkNotNull(status, "status");
         this.status = Optional.of(status);
         return this;
     }
 
-    public ListInvitationsRequestBuilder status(Optional<? extends QueryParamStatus> status) {
+    public ListInvitationsRequestBuilder status(java.util.Optional<? extends com.clerk.backend_api.models.operations.QueryParamStatus> status) {
         Utils.checkNotNull(status, "status");
         this.status = status;
         return this;
@@ -105,15 +100,15 @@ public Stream<ListInvitationsResponse> callAsStream() {
         });
     }
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
             new LazySingletonValue<>(
                     "limit",
                     "10",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
             new LazySingletonValue<>(
                     "offset",
                     "0",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListInvitationsResponse.java b/src/main/java/com/clerk/backend_api/models/operations/ListInvitationsResponse.java
index 888e36f..c4d5752 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListInvitationsResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListInvitationsResponse.java
@@ -4,20 +4,27 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Invitation;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
 import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 
-public class ListInvitationsResponse implements com.clerk.backend_api.utils.Response {
+
+public class ListInvitationsResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -37,7 +44,7 @@ public class ListInvitationsResponse implements com.clerk.backend_api.utils.Resp
     /**
      * List of invitations
      */
-    private Optional<? extends java.util.List<com.clerk.backend_api.models.components.Invitation>> invitationList;
+    private Optional<? extends List<Invitation>> invitationList;
 
     private Callable<Optional<ListInvitationsResponse>> next = () -> Optional.empty();
 
@@ -46,7 +53,7 @@ public ListInvitationsResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends java.util.List<com.clerk.backend_api.models.components.Invitation>> invitationList) {
+            Optional<? extends List<Invitation>> invitationList) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -93,8 +100,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<com.clerk.backend_api.models.components.Invitation>> invitationList() {
-        return (Optional<java.util.List<com.clerk.backend_api.models.components.Invitation>>) invitationList;
+    public Optional<List<Invitation>> invitationList() {
+        return (Optional<List<Invitation>>) invitationList;
     }
 
     public Optional<ListInvitationsResponse> next() throws Exception {
@@ -141,7 +148,7 @@ public ListInvitationsResponse withRawResponse(HttpResponse<InputStream> rawResp
     /**
      * List of invitations
      */
-    public ListInvitationsResponse withInvitationList(java.util.List<com.clerk.backend_api.models.components.Invitation> invitationList) {
+    public ListInvitationsResponse withInvitationList(List<Invitation> invitationList) {
         Utils.checkNotNull(invitationList, "invitationList");
         this.invitationList = Optional.ofNullable(invitationList);
         return this;
@@ -150,7 +157,7 @@ public ListInvitationsResponse withInvitationList(java.util.List<com.clerk.backe
     /**
      * List of invitations
      */
-    public ListInvitationsResponse withInvitationList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.Invitation>> invitationList) {
+    public ListInvitationsResponse withInvitationList(Optional<? extends List<Invitation>> invitationList) {
         Utils.checkNotNull(invitationList, "invitationList");
         this.invitationList = invitationList;
         return this;
@@ -166,15 +173,15 @@ public boolean equals(java.lang.Object o) {
         }
         ListInvitationsResponse other = (ListInvitationsResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.invitationList, other.invitationList);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.invitationList, other.invitationList);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -199,7 +206,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends java.util.List<com.clerk.backend_api.models.components.Invitation>> invitationList = Optional.empty();  
+        private Optional<? extends List<Invitation>> invitationList = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -235,7 +242,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * List of invitations
          */
-        public Builder invitationList(java.util.List<com.clerk.backend_api.models.components.Invitation> invitationList) {
+        public Builder invitationList(List<Invitation> invitationList) {
             Utils.checkNotNull(invitationList, "invitationList");
             this.invitationList = Optional.ofNullable(invitationList);
             return this;
@@ -244,7 +251,7 @@ public Builder invitationList(java.util.List<com.clerk.backend_api.models.compon
         /**
          * List of invitations
          */
-        public Builder invitationList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.Invitation>> invitationList) {
+        public Builder invitationList(Optional<? extends List<Invitation>> invitationList) {
             Utils.checkNotNull(invitationList, "invitationList");
             this.invitationList = invitationList;
             return this;
@@ -253,7 +260,7 @@ public Builder invitationList(Optional<? extends java.util.List<com.clerk.backen
         /**
          * Internal API. Not for public use. Sets the provider of the next page.
          *
-         * @deprecated not part of the public API, may be removed without notice
+         * @Deprecated not part of the public API, may be removed without notice
          */
         @Deprecated
         public Builder next(Callable<Optional<ListInvitationsResponse>> next) {
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListJWTTemplatesRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/ListJWTTemplatesRequestBuilder.java
index 8d8d3dd..6c62099 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListJWTTemplatesRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListJWTTemplatesRequestBuilder.java
@@ -4,18 +4,6 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class ListJWTTemplatesRequestBuilder {
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListJWTTemplatesResponse.java b/src/main/java/com/clerk/backend_api/models/operations/ListJWTTemplatesResponse.java
index cdff7c2..c4e7541 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListJWTTemplatesResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListJWTTemplatesResponse.java
@@ -4,19 +4,24 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.JWTTemplate;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
-public class ListJWTTemplatesResponse implements com.clerk.backend_api.utils.Response {
+
+public class ListJWTTemplatesResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +41,14 @@ public class ListJWTTemplatesResponse implements com.clerk.backend_api.utils.Res
     /**
      * List of JWT templates
      */
-    private Optional<? extends java.util.List<com.clerk.backend_api.models.components.JWTTemplate>> jwtTemplateList;
+    private Optional<? extends List<JWTTemplate>> jwtTemplateList;
 
     @JsonCreator
     public ListJWTTemplatesResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends java.util.List<com.clerk.backend_api.models.components.JWTTemplate>> jwtTemplateList) {
+            Optional<? extends List<JWTTemplate>> jwtTemplateList) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +95,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<com.clerk.backend_api.models.components.JWTTemplate>> jwtTemplateList() {
-        return (Optional<java.util.List<com.clerk.backend_api.models.components.JWTTemplate>>) jwtTemplateList;
+    public Optional<List<JWTTemplate>> jwtTemplateList() {
+        return (Optional<List<JWTTemplate>>) jwtTemplateList;
     }
 
     public final static Builder builder() {
@@ -128,7 +133,7 @@ public ListJWTTemplatesResponse withRawResponse(HttpResponse<InputStream> rawRes
     /**
      * List of JWT templates
      */
-    public ListJWTTemplatesResponse withJWTTemplateList(java.util.List<com.clerk.backend_api.models.components.JWTTemplate> jwtTemplateList) {
+    public ListJWTTemplatesResponse withJWTTemplateList(List<JWTTemplate> jwtTemplateList) {
         Utils.checkNotNull(jwtTemplateList, "jwtTemplateList");
         this.jwtTemplateList = Optional.ofNullable(jwtTemplateList);
         return this;
@@ -137,7 +142,7 @@ public ListJWTTemplatesResponse withJWTTemplateList(java.util.List<com.clerk.bac
     /**
      * List of JWT templates
      */
-    public ListJWTTemplatesResponse withJWTTemplateList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.JWTTemplate>> jwtTemplateList) {
+    public ListJWTTemplatesResponse withJWTTemplateList(Optional<? extends List<JWTTemplate>> jwtTemplateList) {
         Utils.checkNotNull(jwtTemplateList, "jwtTemplateList");
         this.jwtTemplateList = jwtTemplateList;
         return this;
@@ -153,15 +158,15 @@ public boolean equals(java.lang.Object o) {
         }
         ListJWTTemplatesResponse other = (ListJWTTemplatesResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.jwtTemplateList, other.jwtTemplateList);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.jwtTemplateList, other.jwtTemplateList);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +190,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends java.util.List<com.clerk.backend_api.models.components.JWTTemplate>> jwtTemplateList = Optional.empty();  
+        private Optional<? extends List<JWTTemplate>> jwtTemplateList = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +226,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * List of JWT templates
          */
-        public Builder jwtTemplateList(java.util.List<com.clerk.backend_api.models.components.JWTTemplate> jwtTemplateList) {
+        public Builder jwtTemplateList(List<JWTTemplate> jwtTemplateList) {
             Utils.checkNotNull(jwtTemplateList, "jwtTemplateList");
             this.jwtTemplateList = Optional.ofNullable(jwtTemplateList);
             return this;
@@ -230,7 +235,7 @@ public Builder jwtTemplateList(java.util.List<com.clerk.backend_api.models.compo
         /**
          * List of JWT templates
          */
-        public Builder jwtTemplateList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.JWTTemplate>> jwtTemplateList) {
+        public Builder jwtTemplateList(Optional<? extends List<JWTTemplate>> jwtTemplateList) {
             Utils.checkNotNull(jwtTemplateList, "jwtTemplateList");
             this.jwtTemplateList = jwtTemplateList;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListOAuthApplicationsRequest.java b/src/main/java/com/clerk/backend_api/models/operations/ListOAuthApplicationsRequest.java
index b2917a8..f431fbf 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListOAuthApplicationsRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListOAuthApplicationsRequest.java
@@ -4,19 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class ListOAuthApplicationsRequest {
 
     /**
@@ -24,7 +25,7 @@ public class ListOAuthApplicationsRequest {
      * Can be used for paginating the results together with `offset`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=limit")
-    private Optional<? extends Long> limit;
+    private Optional<Long> limit;
 
     /**
      * Skip the first `offset` results when paginating.
@@ -32,12 +33,12 @@ public class ListOAuthApplicationsRequest {
      * To be used in conjunction with `limit`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=offset")
-    private Optional<? extends Long> offset;
+    private Optional<Long> offset;
 
     @JsonCreator
     public ListOAuthApplicationsRequest(
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) {
+            Optional<Long> limit,
+            Optional<Long> offset) {
         Utils.checkNotNull(limit, "limit");
         Utils.checkNotNull(offset, "offset");
         this.limit = limit;
@@ -52,10 +53,9 @@ public ListOAuthApplicationsRequest() {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> limit() {
-        return (Optional<Long>) limit;
+        return limit;
     }
 
     /**
@@ -63,10 +63,9 @@ public Optional<Long> limit() {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> offset() {
-        return (Optional<Long>) offset;
+        return offset;
     }
 
     public final static Builder builder() {
@@ -87,7 +86,7 @@ public ListOAuthApplicationsRequest withLimit(long limit) {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    public ListOAuthApplicationsRequest withLimit(Optional<? extends Long> limit) {
+    public ListOAuthApplicationsRequest withLimit(Optional<Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -109,7 +108,7 @@ public ListOAuthApplicationsRequest withOffset(long offset) {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    public ListOAuthApplicationsRequest withOffset(Optional<? extends Long> offset) {
+    public ListOAuthApplicationsRequest withOffset(Optional<Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -125,13 +124,13 @@ public boolean equals(java.lang.Object o) {
         }
         ListOAuthApplicationsRequest other = (ListOAuthApplicationsRequest) o;
         return 
-            java.util.Objects.deepEquals(this.limit, other.limit) &&
-            java.util.Objects.deepEquals(this.offset, other.offset);
+            Objects.deepEquals(this.limit, other.limit) &&
+            Objects.deepEquals(this.offset, other.offset);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             limit,
             offset);
     }
@@ -145,9 +144,9 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends Long> limit;
+        private Optional<Long> limit;
  
-        private Optional<? extends Long> offset;  
+        private Optional<Long> offset;  
         
         private Builder() {
           // force use of static builder() method
@@ -167,7 +166,7 @@ public Builder limit(long limit) {
          * Applies a limit to the number of results returned.
          * Can be used for paginating the results together with `offset`.
          */
-        public Builder limit(Optional<? extends Long> limit) {
+        public Builder limit(Optional<Long> limit) {
             Utils.checkNotNull(limit, "limit");
             this.limit = limit;
             return this;
@@ -189,7 +188,7 @@ public Builder offset(long offset) {
          * Needs to be an integer greater or equal to zero.
          * To be used in conjunction with `limit`.
          */
-        public Builder offset(Optional<? extends Long> offset) {
+        public Builder offset(Optional<Long> offset) {
             Utils.checkNotNull(offset, "offset");
             this.offset = offset;
             return this;
@@ -207,17 +206,17 @@ public ListOAuthApplicationsRequest build() {
                 offset);
         }
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
                 new LazySingletonValue<>(
                         "limit",
                         "10",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
                 new LazySingletonValue<>(
                         "offset",
                         "0",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListOAuthApplicationsRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/ListOAuthApplicationsRequestBuilder.java
index 6afd1a9..9e83a8d 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListOAuthApplicationsRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListOAuthApplicationsRequestBuilder.java
@@ -8,25 +8,20 @@
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.Long;
 import java.util.Optional;
 import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class ListOAuthApplicationsRequestBuilder {
 
-    private Optional<? extends Long> limit = Utils.readDefaultOrConstValue(
+    private Optional<Long> limit = Utils.readDefaultOrConstValue(
                             "limit",
                             "10",
-                            new TypeReference<Optional<? extends Long>>() {});
-    private Optional<? extends Long> offset = Utils.readDefaultOrConstValue(
+                            new TypeReference<Optional<Long>>() {});
+    private Optional<Long> offset = Utils.readDefaultOrConstValue(
                             "offset",
                             "0",
-                            new TypeReference<Optional<? extends Long>>() {});
+                            new TypeReference<Optional<Long>>() {});
     private final SDKMethodInterfaces.MethodCallListOAuthApplications sdk;
 
     public ListOAuthApplicationsRequestBuilder(SDKMethodInterfaces.MethodCallListOAuthApplications sdk) {
@@ -39,7 +34,7 @@ public ListOAuthApplicationsRequestBuilder limit(long limit) {
         return this;
     }
 
-    public ListOAuthApplicationsRequestBuilder limit(Optional<? extends Long> limit) {
+    public ListOAuthApplicationsRequestBuilder limit(java.util.Optional<java.lang.Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -51,7 +46,7 @@ public ListOAuthApplicationsRequestBuilder offset(long offset) {
         return this;
     }
 
-    public ListOAuthApplicationsRequestBuilder offset(Optional<? extends Long> offset) {
+    public ListOAuthApplicationsRequestBuilder offset(java.util.Optional<java.lang.Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -91,15 +86,15 @@ public Stream<ListOAuthApplicationsResponse> callAsStream() {
         });
     }
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
             new LazySingletonValue<>(
                     "limit",
                     "10",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
             new LazySingletonValue<>(
                     "offset",
                     "0",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListOAuthApplicationsResponse.java b/src/main/java/com/clerk/backend_api/models/operations/ListOAuthApplicationsResponse.java
index c1ceac5..083b2dd 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListOAuthApplicationsResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListOAuthApplicationsResponse.java
@@ -4,20 +4,26 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OAuthApplications;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
 import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 
-public class ListOAuthApplicationsResponse implements com.clerk.backend_api.utils.Response {
+
+public class ListOAuthApplicationsResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -37,7 +43,7 @@ public class ListOAuthApplicationsResponse implements com.clerk.backend_api.util
     /**
      * A list of OAuth applications
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OAuthApplications> oAuthApplications;
+    private Optional<? extends OAuthApplications> oAuthApplications;
 
     private Callable<Optional<ListOAuthApplicationsResponse>> next = () -> Optional.empty();
 
@@ -46,7 +52,7 @@ public ListOAuthApplicationsResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OAuthApplications> oAuthApplications) {
+            Optional<? extends OAuthApplications> oAuthApplications) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -93,8 +99,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OAuthApplications> oAuthApplications() {
-        return (Optional<com.clerk.backend_api.models.components.OAuthApplications>) oAuthApplications;
+    public Optional<OAuthApplications> oAuthApplications() {
+        return (Optional<OAuthApplications>) oAuthApplications;
     }
 
     public Optional<ListOAuthApplicationsResponse> next() throws Exception {
@@ -141,7 +147,7 @@ public ListOAuthApplicationsResponse withRawResponse(HttpResponse<InputStream> r
     /**
      * A list of OAuth applications
      */
-    public ListOAuthApplicationsResponse withOAuthApplications(com.clerk.backend_api.models.components.OAuthApplications oAuthApplications) {
+    public ListOAuthApplicationsResponse withOAuthApplications(OAuthApplications oAuthApplications) {
         Utils.checkNotNull(oAuthApplications, "oAuthApplications");
         this.oAuthApplications = Optional.ofNullable(oAuthApplications);
         return this;
@@ -150,7 +156,7 @@ public ListOAuthApplicationsResponse withOAuthApplications(com.clerk.backend_api
     /**
      * A list of OAuth applications
      */
-    public ListOAuthApplicationsResponse withOAuthApplications(Optional<? extends com.clerk.backend_api.models.components.OAuthApplications> oAuthApplications) {
+    public ListOAuthApplicationsResponse withOAuthApplications(Optional<? extends OAuthApplications> oAuthApplications) {
         Utils.checkNotNull(oAuthApplications, "oAuthApplications");
         this.oAuthApplications = oAuthApplications;
         return this;
@@ -166,15 +172,15 @@ public boolean equals(java.lang.Object o) {
         }
         ListOAuthApplicationsResponse other = (ListOAuthApplicationsResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.oAuthApplications, other.oAuthApplications);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.oAuthApplications, other.oAuthApplications);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -199,7 +205,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OAuthApplications> oAuthApplications = Optional.empty();  
+        private Optional<? extends OAuthApplications> oAuthApplications = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -235,7 +241,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A list of OAuth applications
          */
-        public Builder oAuthApplications(com.clerk.backend_api.models.components.OAuthApplications oAuthApplications) {
+        public Builder oAuthApplications(OAuthApplications oAuthApplications) {
             Utils.checkNotNull(oAuthApplications, "oAuthApplications");
             this.oAuthApplications = Optional.ofNullable(oAuthApplications);
             return this;
@@ -244,7 +250,7 @@ public Builder oAuthApplications(com.clerk.backend_api.models.components.OAuthAp
         /**
          * A list of OAuth applications
          */
-        public Builder oAuthApplications(Optional<? extends com.clerk.backend_api.models.components.OAuthApplications> oAuthApplications) {
+        public Builder oAuthApplications(Optional<? extends OAuthApplications> oAuthApplications) {
             Utils.checkNotNull(oAuthApplications, "oAuthApplications");
             this.oAuthApplications = oAuthApplications;
             return this;
@@ -253,7 +259,7 @@ public Builder oAuthApplications(Optional<? extends com.clerk.backend_api.models
         /**
          * Internal API. Not for public use. Sets the provider of the next page.
          *
-         * @deprecated not part of the public API, may be removed without notice
+         * @Deprecated not part of the public API, may be removed without notice
          */
         @Deprecated
         public Builder next(Callable<Optional<ListOAuthApplicationsResponse>> next) {
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsQueryParamStatus.java b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsQueryParamStatus.java
index 6e72836..609a2f8 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsQueryParamStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsQueryParamStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * ListOrganizationInvitationsQueryParamStatus - Filter organization invitations based on their status
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsRequest.java b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsRequest.java
index e2242e4..5eafefb 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsRequest.java
@@ -4,19 +4,21 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class ListOrganizationInvitationsRequest {
 
     /**
@@ -30,7 +32,7 @@ public class ListOrganizationInvitationsRequest {
      * Can be used for paginating the results together with `offset`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=limit")
-    private Optional<? extends Long> limit;
+    private Optional<Long> limit;
 
     /**
      * Skip the first `offset` results when paginating.
@@ -38,7 +40,7 @@ public class ListOrganizationInvitationsRequest {
      * To be used in conjunction with `limit`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=offset")
-    private Optional<? extends Long> offset;
+    private Optional<Long> offset;
 
     /**
      * Filter organization invitations based on their status
@@ -49,8 +51,8 @@ public class ListOrganizationInvitationsRequest {
     @JsonCreator
     public ListOrganizationInvitationsRequest(
             String organizationId,
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset,
+            Optional<Long> limit,
+            Optional<Long> offset,
             Optional<? extends ListOrganizationInvitationsQueryParamStatus> status) {
         Utils.checkNotNull(organizationId, "organizationId");
         Utils.checkNotNull(limit, "limit");
@@ -79,10 +81,9 @@ public String organizationId() {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> limit() {
-        return (Optional<Long>) limit;
+        return limit;
     }
 
     /**
@@ -90,10 +91,9 @@ public Optional<Long> limit() {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> offset() {
-        return (Optional<Long>) offset;
+        return offset;
     }
 
     /**
@@ -132,7 +132,7 @@ public ListOrganizationInvitationsRequest withLimit(long limit) {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    public ListOrganizationInvitationsRequest withLimit(Optional<? extends Long> limit) {
+    public ListOrganizationInvitationsRequest withLimit(Optional<Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -154,7 +154,7 @@ public ListOrganizationInvitationsRequest withOffset(long offset) {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    public ListOrganizationInvitationsRequest withOffset(Optional<? extends Long> offset) {
+    public ListOrganizationInvitationsRequest withOffset(Optional<Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -188,15 +188,15 @@ public boolean equals(java.lang.Object o) {
         }
         ListOrganizationInvitationsRequest other = (ListOrganizationInvitationsRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.limit, other.limit) &&
-            java.util.Objects.deepEquals(this.offset, other.offset) &&
-            java.util.Objects.deepEquals(this.status, other.status);
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.limit, other.limit) &&
+            Objects.deepEquals(this.offset, other.offset) &&
+            Objects.deepEquals(this.status, other.status);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId,
             limit,
             offset,
@@ -216,9 +216,9 @@ public final static class Builder {
  
         private String organizationId;
  
-        private Optional<? extends Long> limit;
+        private Optional<Long> limit;
  
-        private Optional<? extends Long> offset;
+        private Optional<Long> offset;
  
         private Optional<? extends ListOrganizationInvitationsQueryParamStatus> status = Optional.empty();  
         
@@ -249,7 +249,7 @@ public Builder limit(long limit) {
          * Applies a limit to the number of results returned.
          * Can be used for paginating the results together with `offset`.
          */
-        public Builder limit(Optional<? extends Long> limit) {
+        public Builder limit(Optional<Long> limit) {
             Utils.checkNotNull(limit, "limit");
             this.limit = limit;
             return this;
@@ -271,7 +271,7 @@ public Builder offset(long offset) {
          * Needs to be an integer greater or equal to zero.
          * To be used in conjunction with `limit`.
          */
-        public Builder offset(Optional<? extends Long> offset) {
+        public Builder offset(Optional<Long> offset) {
             Utils.checkNotNull(offset, "offset");
             this.offset = offset;
             return this;
@@ -309,17 +309,17 @@ public ListOrganizationInvitationsRequest build() {
                 status);
         }
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
                 new LazySingletonValue<>(
                         "limit",
                         "10",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
                 new LazySingletonValue<>(
                         "offset",
                         "0",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsRequestBuilder.java
index ef3ac55..bafa6a8 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsRequestBuilder.java
@@ -8,26 +8,22 @@
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.Long;
+import java.lang.String;
 import java.util.Optional;
 import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class ListOrganizationInvitationsRequestBuilder {
 
     private String organizationId;
-    private Optional<? extends Long> limit = Utils.readDefaultOrConstValue(
+    private Optional<Long> limit = Utils.readDefaultOrConstValue(
                             "limit",
                             "10",
-                            new TypeReference<Optional<? extends Long>>() {});
-    private Optional<? extends Long> offset = Utils.readDefaultOrConstValue(
+                            new TypeReference<Optional<Long>>() {});
+    private Optional<Long> offset = Utils.readDefaultOrConstValue(
                             "offset",
                             "0",
-                            new TypeReference<Optional<? extends Long>>() {});
+                            new TypeReference<Optional<Long>>() {});
     private Optional<? extends ListOrganizationInvitationsQueryParamStatus> status = Optional.empty();
     private final SDKMethodInterfaces.MethodCallListOrganizationInvitations sdk;
 
@@ -35,7 +31,7 @@ public ListOrganizationInvitationsRequestBuilder(SDKMethodInterfaces.MethodCallL
         this.sdk = sdk;
     }
 
-    public ListOrganizationInvitationsRequestBuilder organizationId(String organizationId) {
+    public ListOrganizationInvitationsRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
@@ -47,7 +43,7 @@ public ListOrganizationInvitationsRequestBuilder limit(long limit) {
         return this;
     }
 
-    public ListOrganizationInvitationsRequestBuilder limit(Optional<? extends Long> limit) {
+    public ListOrganizationInvitationsRequestBuilder limit(java.util.Optional<java.lang.Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -59,19 +55,19 @@ public ListOrganizationInvitationsRequestBuilder offset(long offset) {
         return this;
     }
 
-    public ListOrganizationInvitationsRequestBuilder offset(Optional<? extends Long> offset) {
+    public ListOrganizationInvitationsRequestBuilder offset(java.util.Optional<java.lang.Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
     }
                 
-    public ListOrganizationInvitationsRequestBuilder status(ListOrganizationInvitationsQueryParamStatus status) {
+    public ListOrganizationInvitationsRequestBuilder status(com.clerk.backend_api.models.operations.ListOrganizationInvitationsQueryParamStatus status) {
         Utils.checkNotNull(status, "status");
         this.status = Optional.of(status);
         return this;
     }
 
-    public ListOrganizationInvitationsRequestBuilder status(Optional<? extends ListOrganizationInvitationsQueryParamStatus> status) {
+    public ListOrganizationInvitationsRequestBuilder status(java.util.Optional<? extends com.clerk.backend_api.models.operations.ListOrganizationInvitationsQueryParamStatus> status) {
         Utils.checkNotNull(status, "status");
         this.status = status;
         return this;
@@ -113,15 +109,15 @@ public Stream<ListOrganizationInvitationsResponse> callAsStream() {
         });
     }
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
             new LazySingletonValue<>(
                     "limit",
                     "10",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
             new LazySingletonValue<>(
                     "offset",
                     "0",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsResponse.java b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsResponse.java
index b276037..01d05d5 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationInvitationsResponse.java
@@ -4,20 +4,26 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OrganizationInvitations;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
 import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 
-public class ListOrganizationInvitationsResponse implements com.clerk.backend_api.utils.Response {
+
+public class ListOrganizationInvitationsResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -37,7 +43,7 @@ public class ListOrganizationInvitationsResponse implements com.clerk.backend_ap
     /**
      * A list of organization invitations
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations;
+    private Optional<? extends OrganizationInvitations> organizationInvitations;
 
     private Callable<Optional<ListOrganizationInvitationsResponse>> next = () -> Optional.empty();
 
@@ -46,7 +52,7 @@ public ListOrganizationInvitationsResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations) {
+            Optional<? extends OrganizationInvitations> organizationInvitations) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -93,8 +99,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations() {
-        return (Optional<com.clerk.backend_api.models.components.OrganizationInvitations>) organizationInvitations;
+    public Optional<OrganizationInvitations> organizationInvitations() {
+        return (Optional<OrganizationInvitations>) organizationInvitations;
     }
 
     public Optional<ListOrganizationInvitationsResponse> next() throws Exception {
@@ -141,7 +147,7 @@ public ListOrganizationInvitationsResponse withRawResponse(HttpResponse<InputStr
     /**
      * A list of organization invitations
      */
-    public ListOrganizationInvitationsResponse withOrganizationInvitations(com.clerk.backend_api.models.components.OrganizationInvitations organizationInvitations) {
+    public ListOrganizationInvitationsResponse withOrganizationInvitations(OrganizationInvitations organizationInvitations) {
         Utils.checkNotNull(organizationInvitations, "organizationInvitations");
         this.organizationInvitations = Optional.ofNullable(organizationInvitations);
         return this;
@@ -150,7 +156,7 @@ public ListOrganizationInvitationsResponse withOrganizationInvitations(com.clerk
     /**
      * A list of organization invitations
      */
-    public ListOrganizationInvitationsResponse withOrganizationInvitations(Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations) {
+    public ListOrganizationInvitationsResponse withOrganizationInvitations(Optional<? extends OrganizationInvitations> organizationInvitations) {
         Utils.checkNotNull(organizationInvitations, "organizationInvitations");
         this.organizationInvitations = organizationInvitations;
         return this;
@@ -166,15 +172,15 @@ public boolean equals(java.lang.Object o) {
         }
         ListOrganizationInvitationsResponse other = (ListOrganizationInvitationsResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizationInvitations, other.organizationInvitations);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizationInvitations, other.organizationInvitations);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -199,7 +205,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations = Optional.empty();  
+        private Optional<? extends OrganizationInvitations> organizationInvitations = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -235,7 +241,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A list of organization invitations
          */
-        public Builder organizationInvitations(com.clerk.backend_api.models.components.OrganizationInvitations organizationInvitations) {
+        public Builder organizationInvitations(OrganizationInvitations organizationInvitations) {
             Utils.checkNotNull(organizationInvitations, "organizationInvitations");
             this.organizationInvitations = Optional.ofNullable(organizationInvitations);
             return this;
@@ -244,7 +250,7 @@ public Builder organizationInvitations(com.clerk.backend_api.models.components.O
         /**
          * A list of organization invitations
          */
-        public Builder organizationInvitations(Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations) {
+        public Builder organizationInvitations(Optional<? extends OrganizationInvitations> organizationInvitations) {
             Utils.checkNotNull(organizationInvitations, "organizationInvitations");
             this.organizationInvitations = organizationInvitations;
             return this;
@@ -253,7 +259,7 @@ public Builder organizationInvitations(Optional<? extends com.clerk.backend_api.
         /**
          * Internal API. Not for public use. Sets the provider of the next page.
          *
-         * @deprecated not part of the public API, may be removed without notice
+         * @Deprecated not part of the public API, may be removed without notice
          */
         @Deprecated
         public Builder next(Callable<Optional<ListOrganizationInvitationsResponse>> next) {
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationMembershipsRequest.java b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationMembershipsRequest.java
index 61e22f1..5029c44 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationMembershipsRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationMembershipsRequest.java
@@ -4,19 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class ListOrganizationMembershipsRequest {
 
     /**
@@ -30,7 +31,7 @@ public class ListOrganizationMembershipsRequest {
      * Can be used for paginating the results together with `offset`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=limit")
-    private Optional<? extends Long> limit;
+    private Optional<Long> limit;
 
     /**
      * Skip the first `offset` results when paginating.
@@ -38,7 +39,7 @@ public class ListOrganizationMembershipsRequest {
      * To be used in conjunction with `limit`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=offset")
-    private Optional<? extends Long> offset;
+    private Optional<Long> offset;
 
     /**
      * Sorts organizations memberships by phone_number, email_address, created_at, first_name, last_name or username.
@@ -46,14 +47,14 @@ public class ListOrganizationMembershipsRequest {
      * we can choose to sort in ascending (ASC) or descending (DESC) order."
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=order_by")
-    private Optional<? extends String> orderBy;
+    private Optional<String> orderBy;
 
     @JsonCreator
     public ListOrganizationMembershipsRequest(
             String organizationId,
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset,
-            Optional<? extends String> orderBy) {
+            Optional<Long> limit,
+            Optional<Long> offset,
+            Optional<String> orderBy) {
         Utils.checkNotNull(organizationId, "organizationId");
         Utils.checkNotNull(limit, "limit");
         Utils.checkNotNull(offset, "offset");
@@ -81,10 +82,9 @@ public String organizationId() {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> limit() {
-        return (Optional<Long>) limit;
+        return limit;
     }
 
     /**
@@ -92,10 +92,9 @@ public Optional<Long> limit() {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> offset() {
-        return (Optional<Long>) offset;
+        return offset;
     }
 
     /**
@@ -103,10 +102,9 @@ public Optional<Long> offset() {
      * By prepending one of those values with + or -,
      * we can choose to sort in ascending (ASC) or descending (DESC) order."
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> orderBy() {
-        return (Optional<String>) orderBy;
+        return orderBy;
     }
 
     public final static Builder builder() {
@@ -136,7 +134,7 @@ public ListOrganizationMembershipsRequest withLimit(long limit) {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    public ListOrganizationMembershipsRequest withLimit(Optional<? extends Long> limit) {
+    public ListOrganizationMembershipsRequest withLimit(Optional<Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -158,7 +156,7 @@ public ListOrganizationMembershipsRequest withOffset(long offset) {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    public ListOrganizationMembershipsRequest withOffset(Optional<? extends Long> offset) {
+    public ListOrganizationMembershipsRequest withOffset(Optional<Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -180,7 +178,7 @@ public ListOrganizationMembershipsRequest withOrderBy(String orderBy) {
      * By prepending one of those values with + or -,
      * we can choose to sort in ascending (ASC) or descending (DESC) order."
      */
-    public ListOrganizationMembershipsRequest withOrderBy(Optional<? extends String> orderBy) {
+    public ListOrganizationMembershipsRequest withOrderBy(Optional<String> orderBy) {
         Utils.checkNotNull(orderBy, "orderBy");
         this.orderBy = orderBy;
         return this;
@@ -196,15 +194,15 @@ public boolean equals(java.lang.Object o) {
         }
         ListOrganizationMembershipsRequest other = (ListOrganizationMembershipsRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.limit, other.limit) &&
-            java.util.Objects.deepEquals(this.offset, other.offset) &&
-            java.util.Objects.deepEquals(this.orderBy, other.orderBy);
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.limit, other.limit) &&
+            Objects.deepEquals(this.offset, other.offset) &&
+            Objects.deepEquals(this.orderBy, other.orderBy);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId,
             limit,
             offset,
@@ -224,11 +222,11 @@ public final static class Builder {
  
         private String organizationId;
  
-        private Optional<? extends Long> limit;
+        private Optional<Long> limit;
  
-        private Optional<? extends Long> offset;
+        private Optional<Long> offset;
  
-        private Optional<? extends String> orderBy = Optional.empty();  
+        private Optional<String> orderBy = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -257,7 +255,7 @@ public Builder limit(long limit) {
          * Applies a limit to the number of results returned.
          * Can be used for paginating the results together with `offset`.
          */
-        public Builder limit(Optional<? extends Long> limit) {
+        public Builder limit(Optional<Long> limit) {
             Utils.checkNotNull(limit, "limit");
             this.limit = limit;
             return this;
@@ -279,7 +277,7 @@ public Builder offset(long offset) {
          * Needs to be an integer greater or equal to zero.
          * To be used in conjunction with `limit`.
          */
-        public Builder offset(Optional<? extends Long> offset) {
+        public Builder offset(Optional<Long> offset) {
             Utils.checkNotNull(offset, "offset");
             this.offset = offset;
             return this;
@@ -301,7 +299,7 @@ public Builder orderBy(String orderBy) {
          * By prepending one of those values with + or -,
          * we can choose to sort in ascending (ASC) or descending (DESC) order."
          */
-        public Builder orderBy(Optional<? extends String> orderBy) {
+        public Builder orderBy(Optional<String> orderBy) {
             Utils.checkNotNull(orderBy, "orderBy");
             this.orderBy = orderBy;
             return this;
@@ -321,17 +319,17 @@ public ListOrganizationMembershipsRequest build() {
                 orderBy);
         }
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
                 new LazySingletonValue<>(
                         "limit",
                         "10",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
                 new LazySingletonValue<>(
                         "offset",
                         "0",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationMembershipsRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationMembershipsRequestBuilder.java
index 99faa8a..1ce3958 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationMembershipsRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationMembershipsRequestBuilder.java
@@ -8,34 +8,30 @@
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.Long;
+import java.lang.String;
 import java.util.Optional;
 import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class ListOrganizationMembershipsRequestBuilder {
 
     private String organizationId;
-    private Optional<? extends Long> limit = Utils.readDefaultOrConstValue(
+    private Optional<Long> limit = Utils.readDefaultOrConstValue(
                             "limit",
                             "10",
-                            new TypeReference<Optional<? extends Long>>() {});
-    private Optional<? extends Long> offset = Utils.readDefaultOrConstValue(
+                            new TypeReference<Optional<Long>>() {});
+    private Optional<Long> offset = Utils.readDefaultOrConstValue(
                             "offset",
                             "0",
-                            new TypeReference<Optional<? extends Long>>() {});
-    private Optional<? extends String> orderBy = Optional.empty();
+                            new TypeReference<Optional<Long>>() {});
+    private Optional<String> orderBy = Optional.empty();
     private final SDKMethodInterfaces.MethodCallListOrganizationMemberships sdk;
 
     public ListOrganizationMembershipsRequestBuilder(SDKMethodInterfaces.MethodCallListOrganizationMemberships sdk) {
         this.sdk = sdk;
     }
 
-    public ListOrganizationMembershipsRequestBuilder organizationId(String organizationId) {
+    public ListOrganizationMembershipsRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
@@ -47,7 +43,7 @@ public ListOrganizationMembershipsRequestBuilder limit(long limit) {
         return this;
     }
 
-    public ListOrganizationMembershipsRequestBuilder limit(Optional<? extends Long> limit) {
+    public ListOrganizationMembershipsRequestBuilder limit(java.util.Optional<java.lang.Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -59,19 +55,19 @@ public ListOrganizationMembershipsRequestBuilder offset(long offset) {
         return this;
     }
 
-    public ListOrganizationMembershipsRequestBuilder offset(Optional<? extends Long> offset) {
+    public ListOrganizationMembershipsRequestBuilder offset(java.util.Optional<java.lang.Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
     }
                 
-    public ListOrganizationMembershipsRequestBuilder orderBy(String orderBy) {
+    public ListOrganizationMembershipsRequestBuilder orderBy(java.lang.String orderBy) {
         Utils.checkNotNull(orderBy, "orderBy");
         this.orderBy = Optional.of(orderBy);
         return this;
     }
 
-    public ListOrganizationMembershipsRequestBuilder orderBy(Optional<? extends String> orderBy) {
+    public ListOrganizationMembershipsRequestBuilder orderBy(java.util.Optional<java.lang.String> orderBy) {
         Utils.checkNotNull(orderBy, "orderBy");
         this.orderBy = orderBy;
         return this;
@@ -113,15 +109,15 @@ public Stream<ListOrganizationMembershipsResponse> callAsStream() {
         });
     }
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
             new LazySingletonValue<>(
                     "limit",
                     "10",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
             new LazySingletonValue<>(
                     "offset",
                     "0",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationMembershipsResponse.java b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationMembershipsResponse.java
index d41dc3c..3e918c6 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationMembershipsResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationMembershipsResponse.java
@@ -4,20 +4,26 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OrganizationMemberships;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
 import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 
-public class ListOrganizationMembershipsResponse implements com.clerk.backend_api.utils.Response {
+
+public class ListOrganizationMembershipsResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -37,7 +43,7 @@ public class ListOrganizationMembershipsResponse implements com.clerk.backend_ap
     /**
      * A list of organization memberships
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OrganizationMemberships> organizationMemberships;
+    private Optional<? extends OrganizationMemberships> organizationMemberships;
 
     private Callable<Optional<ListOrganizationMembershipsResponse>> next = () -> Optional.empty();
 
@@ -46,7 +52,7 @@ public ListOrganizationMembershipsResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OrganizationMemberships> organizationMemberships) {
+            Optional<? extends OrganizationMemberships> organizationMemberships) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -93,8 +99,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OrganizationMemberships> organizationMemberships() {
-        return (Optional<com.clerk.backend_api.models.components.OrganizationMemberships>) organizationMemberships;
+    public Optional<OrganizationMemberships> organizationMemberships() {
+        return (Optional<OrganizationMemberships>) organizationMemberships;
     }
 
     public Optional<ListOrganizationMembershipsResponse> next() throws Exception {
@@ -141,7 +147,7 @@ public ListOrganizationMembershipsResponse withRawResponse(HttpResponse<InputStr
     /**
      * A list of organization memberships
      */
-    public ListOrganizationMembershipsResponse withOrganizationMemberships(com.clerk.backend_api.models.components.OrganizationMemberships organizationMemberships) {
+    public ListOrganizationMembershipsResponse withOrganizationMemberships(OrganizationMemberships organizationMemberships) {
         Utils.checkNotNull(organizationMemberships, "organizationMemberships");
         this.organizationMemberships = Optional.ofNullable(organizationMemberships);
         return this;
@@ -150,7 +156,7 @@ public ListOrganizationMembershipsResponse withOrganizationMemberships(com.clerk
     /**
      * A list of organization memberships
      */
-    public ListOrganizationMembershipsResponse withOrganizationMemberships(Optional<? extends com.clerk.backend_api.models.components.OrganizationMemberships> organizationMemberships) {
+    public ListOrganizationMembershipsResponse withOrganizationMemberships(Optional<? extends OrganizationMemberships> organizationMemberships) {
         Utils.checkNotNull(organizationMemberships, "organizationMemberships");
         this.organizationMemberships = organizationMemberships;
         return this;
@@ -166,15 +172,15 @@ public boolean equals(java.lang.Object o) {
         }
         ListOrganizationMembershipsResponse other = (ListOrganizationMembershipsResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizationMemberships, other.organizationMemberships);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizationMemberships, other.organizationMemberships);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -199,7 +205,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OrganizationMemberships> organizationMemberships = Optional.empty();  
+        private Optional<? extends OrganizationMemberships> organizationMemberships = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -235,7 +241,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A list of organization memberships
          */
-        public Builder organizationMemberships(com.clerk.backend_api.models.components.OrganizationMemberships organizationMemberships) {
+        public Builder organizationMemberships(OrganizationMemberships organizationMemberships) {
             Utils.checkNotNull(organizationMemberships, "organizationMemberships");
             this.organizationMemberships = Optional.ofNullable(organizationMemberships);
             return this;
@@ -244,7 +250,7 @@ public Builder organizationMemberships(com.clerk.backend_api.models.components.O
         /**
          * A list of organization memberships
          */
-        public Builder organizationMemberships(Optional<? extends com.clerk.backend_api.models.components.OrganizationMemberships> organizationMemberships) {
+        public Builder organizationMemberships(Optional<? extends OrganizationMemberships> organizationMemberships) {
             Utils.checkNotNull(organizationMemberships, "organizationMemberships");
             this.organizationMemberships = organizationMemberships;
             return this;
@@ -253,7 +259,7 @@ public Builder organizationMemberships(Optional<? extends com.clerk.backend_api.
         /**
          * Internal API. Not for public use. Sets the provider of the next page.
          *
-         * @deprecated not part of the public API, may be removed without notice
+         * @Deprecated not part of the public API, may be removed without notice
          */
         @Deprecated
         public Builder next(Callable<Optional<ListOrganizationMembershipsResponse>> next) {
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationsRequest.java b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationsRequest.java
index beeb690..5a1ff5e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationsRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationsRequest.java
@@ -4,19 +4,21 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class ListOrganizationsRequest {
 
     /**
@@ -24,7 +26,7 @@ public class ListOrganizationsRequest {
      * Can be used for paginating the results together with `offset`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=limit")
-    private Optional<? extends Long> limit;
+    private Optional<Long> limit;
 
     /**
      * Skip the first `offset` results when paginating.
@@ -32,20 +34,20 @@ public class ListOrganizationsRequest {
      * To be used in conjunction with `limit`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=offset")
-    private Optional<? extends Long> offset;
+    private Optional<Long> offset;
 
     /**
      * Flag to denote whether the member counts of each organization should be included in the response or not.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=include_members_count")
-    private Optional<? extends Boolean> includeMembersCount;
+    private Optional<Boolean> includeMembersCount;
 
     /**
      * Returns organizations with ID, name, or slug that match the given query.
      * Uses exact match for organization ID and partial match for name and slug.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=query")
-    private Optional<? extends String> query;
+    private Optional<String> query;
 
     /**
      * Allows to return organizations in a particular order.
@@ -56,15 +58,15 @@ public class ListOrganizationsRequest {
      * Defaults to `-created_at`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=order_by")
-    private Optional<? extends String> orderBy;
+    private Optional<String> orderBy;
 
     @JsonCreator
     public ListOrganizationsRequest(
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset,
-            Optional<? extends Boolean> includeMembersCount,
-            Optional<? extends String> query,
-            Optional<? extends String> orderBy) {
+            Optional<Long> limit,
+            Optional<Long> offset,
+            Optional<Boolean> includeMembersCount,
+            Optional<String> query,
+            Optional<String> orderBy) {
         Utils.checkNotNull(limit, "limit");
         Utils.checkNotNull(offset, "offset");
         Utils.checkNotNull(includeMembersCount, "includeMembersCount");
@@ -85,10 +87,9 @@ public ListOrganizationsRequest() {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> limit() {
-        return (Optional<Long>) limit;
+        return limit;
     }
 
     /**
@@ -96,29 +97,26 @@ public Optional<Long> limit() {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> offset() {
-        return (Optional<Long>) offset;
+        return offset;
     }
 
     /**
      * Flag to denote whether the member counts of each organization should be included in the response or not.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> includeMembersCount() {
-        return (Optional<Boolean>) includeMembersCount;
+        return includeMembersCount;
     }
 
     /**
      * Returns organizations with ID, name, or slug that match the given query.
      * Uses exact match for organization ID and partial match for name and slug.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> query() {
-        return (Optional<String>) query;
+        return query;
     }
 
     /**
@@ -129,10 +127,9 @@ public Optional<String> query() {
      * If you don't use `+` or `-`, then `+` is implied.
      * Defaults to `-created_at`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> orderBy() {
-        return (Optional<String>) orderBy;
+        return orderBy;
     }
 
     public final static Builder builder() {
@@ -153,7 +150,7 @@ public ListOrganizationsRequest withLimit(long limit) {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    public ListOrganizationsRequest withLimit(Optional<? extends Long> limit) {
+    public ListOrganizationsRequest withLimit(Optional<Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -175,7 +172,7 @@ public ListOrganizationsRequest withOffset(long offset) {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    public ListOrganizationsRequest withOffset(Optional<? extends Long> offset) {
+    public ListOrganizationsRequest withOffset(Optional<Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -193,7 +190,7 @@ public ListOrganizationsRequest withIncludeMembersCount(boolean includeMembersCo
     /**
      * Flag to denote whether the member counts of each organization should be included in the response or not.
      */
-    public ListOrganizationsRequest withIncludeMembersCount(Optional<? extends Boolean> includeMembersCount) {
+    public ListOrganizationsRequest withIncludeMembersCount(Optional<Boolean> includeMembersCount) {
         Utils.checkNotNull(includeMembersCount, "includeMembersCount");
         this.includeMembersCount = includeMembersCount;
         return this;
@@ -213,7 +210,7 @@ public ListOrganizationsRequest withQuery(String query) {
      * Returns organizations with ID, name, or slug that match the given query.
      * Uses exact match for organization ID and partial match for name and slug.
      */
-    public ListOrganizationsRequest withQuery(Optional<? extends String> query) {
+    public ListOrganizationsRequest withQuery(Optional<String> query) {
         Utils.checkNotNull(query, "query");
         this.query = query;
         return this;
@@ -241,7 +238,7 @@ public ListOrganizationsRequest withOrderBy(String orderBy) {
      * If you don't use `+` or `-`, then `+` is implied.
      * Defaults to `-created_at`.
      */
-    public ListOrganizationsRequest withOrderBy(Optional<? extends String> orderBy) {
+    public ListOrganizationsRequest withOrderBy(Optional<String> orderBy) {
         Utils.checkNotNull(orderBy, "orderBy");
         this.orderBy = orderBy;
         return this;
@@ -257,16 +254,16 @@ public boolean equals(java.lang.Object o) {
         }
         ListOrganizationsRequest other = (ListOrganizationsRequest) o;
         return 
-            java.util.Objects.deepEquals(this.limit, other.limit) &&
-            java.util.Objects.deepEquals(this.offset, other.offset) &&
-            java.util.Objects.deepEquals(this.includeMembersCount, other.includeMembersCount) &&
-            java.util.Objects.deepEquals(this.query, other.query) &&
-            java.util.Objects.deepEquals(this.orderBy, other.orderBy);
+            Objects.deepEquals(this.limit, other.limit) &&
+            Objects.deepEquals(this.offset, other.offset) &&
+            Objects.deepEquals(this.includeMembersCount, other.includeMembersCount) &&
+            Objects.deepEquals(this.query, other.query) &&
+            Objects.deepEquals(this.orderBy, other.orderBy);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             limit,
             offset,
             includeMembersCount,
@@ -286,15 +283,15 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends Long> limit;
+        private Optional<Long> limit;
  
-        private Optional<? extends Long> offset;
+        private Optional<Long> offset;
  
-        private Optional<? extends Boolean> includeMembersCount = Optional.empty();
+        private Optional<Boolean> includeMembersCount = Optional.empty();
  
-        private Optional<? extends String> query = Optional.empty();
+        private Optional<String> query = Optional.empty();
  
-        private Optional<? extends String> orderBy;  
+        private Optional<String> orderBy;  
         
         private Builder() {
           // force use of static builder() method
@@ -314,7 +311,7 @@ public Builder limit(long limit) {
          * Applies a limit to the number of results returned.
          * Can be used for paginating the results together with `offset`.
          */
-        public Builder limit(Optional<? extends Long> limit) {
+        public Builder limit(Optional<Long> limit) {
             Utils.checkNotNull(limit, "limit");
             this.limit = limit;
             return this;
@@ -336,7 +333,7 @@ public Builder offset(long offset) {
          * Needs to be an integer greater or equal to zero.
          * To be used in conjunction with `limit`.
          */
-        public Builder offset(Optional<? extends Long> offset) {
+        public Builder offset(Optional<Long> offset) {
             Utils.checkNotNull(offset, "offset");
             this.offset = offset;
             return this;
@@ -354,7 +351,7 @@ public Builder includeMembersCount(boolean includeMembersCount) {
         /**
          * Flag to denote whether the member counts of each organization should be included in the response or not.
          */
-        public Builder includeMembersCount(Optional<? extends Boolean> includeMembersCount) {
+        public Builder includeMembersCount(Optional<Boolean> includeMembersCount) {
             Utils.checkNotNull(includeMembersCount, "includeMembersCount");
             this.includeMembersCount = includeMembersCount;
             return this;
@@ -374,7 +371,7 @@ public Builder query(String query) {
          * Returns organizations with ID, name, or slug that match the given query.
          * Uses exact match for organization ID and partial match for name and slug.
          */
-        public Builder query(Optional<? extends String> query) {
+        public Builder query(Optional<String> query) {
             Utils.checkNotNull(query, "query");
             this.query = query;
             return this;
@@ -402,7 +399,7 @@ public Builder orderBy(String orderBy) {
          * If you don't use `+` or `-`, then `+` is implied.
          * Defaults to `-created_at`.
          */
-        public Builder orderBy(Optional<? extends String> orderBy) {
+        public Builder orderBy(Optional<String> orderBy) {
             Utils.checkNotNull(orderBy, "orderBy");
             this.orderBy = orderBy;
             return this;
@@ -426,23 +423,23 @@ public ListOrganizationsRequest build() {
                 orderBy);
         }
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
                 new LazySingletonValue<>(
                         "limit",
                         "10",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
                 new LazySingletonValue<>(
                         "offset",
                         "0",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
 
-        private static final LazySingletonValue<Optional<? extends String>> _SINGLETON_VALUE_OrderBy =
+        private static final LazySingletonValue<Optional<String>> _SINGLETON_VALUE_OrderBy =
                 new LazySingletonValue<>(
                         "order_by",
                         "\"-created_at\"",
-                        new TypeReference<Optional<? extends String>>() {});
+                        new TypeReference<Optional<String>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationsRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationsRequestBuilder.java
index 4af4243..fbeab3a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationsRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationsRequestBuilder.java
@@ -4,18 +4,7 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class ListOrganizationsRequestBuilder {
 
@@ -26,7 +15,7 @@ public ListOrganizationsRequestBuilder(SDKMethodInterfaces.MethodCallListOrganiz
         this.sdk = sdk;
     }
 
-    public ListOrganizationsRequestBuilder request(ListOrganizationsRequest request) {
+    public ListOrganizationsRequestBuilder request(com.clerk.backend_api.models.operations.ListOrganizationsRequest request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationsResponse.java b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationsResponse.java
index 06e7f84..b4ed299 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationsResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListOrganizationsResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Organizations;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class ListOrganizationsResponse implements com.clerk.backend_api.utils.Response {
+
+public class ListOrganizationsResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class ListOrganizationsResponse implements com.clerk.backend_api.utils.Re
     /**
      * A list of organizations
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Organizations> organizations;
+    private Optional<? extends Organizations> organizations;
 
     @JsonCreator
     public ListOrganizationsResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Organizations> organizations) {
+            Optional<? extends Organizations> organizations) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Organizations> organizations() {
-        return (Optional<com.clerk.backend_api.models.components.Organizations>) organizations;
+    public Optional<Organizations> organizations() {
+        return (Optional<Organizations>) organizations;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public ListOrganizationsResponse withRawResponse(HttpResponse<InputStream> rawRe
     /**
      * A list of organizations
      */
-    public ListOrganizationsResponse withOrganizations(com.clerk.backend_api.models.components.Organizations organizations) {
+    public ListOrganizationsResponse withOrganizations(Organizations organizations) {
         Utils.checkNotNull(organizations, "organizations");
         this.organizations = Optional.ofNullable(organizations);
         return this;
@@ -137,7 +141,7 @@ public ListOrganizationsResponse withOrganizations(com.clerk.backend_api.models.
     /**
      * A list of organizations
      */
-    public ListOrganizationsResponse withOrganizations(Optional<? extends com.clerk.backend_api.models.components.Organizations> organizations) {
+    public ListOrganizationsResponse withOrganizations(Optional<? extends Organizations> organizations) {
         Utils.checkNotNull(organizations, "organizations");
         this.organizations = organizations;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         ListOrganizationsResponse other = (ListOrganizationsResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizations, other.organizations);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizations, other.organizations);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Organizations> organizations = Optional.empty();  
+        private Optional<? extends Organizations> organizations = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A list of organizations
          */
-        public Builder organizations(com.clerk.backend_api.models.components.Organizations organizations) {
+        public Builder organizations(Organizations organizations) {
             Utils.checkNotNull(organizations, "organizations");
             this.organizations = Optional.ofNullable(organizations);
             return this;
@@ -230,7 +234,7 @@ public Builder organizations(com.clerk.backend_api.models.components.Organizatio
         /**
          * A list of organizations
          */
-        public Builder organizations(Optional<? extends com.clerk.backend_api.models.components.Organizations> organizations) {
+        public Builder organizations(Optional<? extends Organizations> organizations) {
             Utils.checkNotNull(organizations, "organizations");
             this.organizations = organizations;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListPendingOrganizationInvitationsRequest.java b/src/main/java/com/clerk/backend_api/models/operations/ListPendingOrganizationInvitationsRequest.java
index b186710..669e666 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListPendingOrganizationInvitationsRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListPendingOrganizationInvitationsRequest.java
@@ -4,19 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class ListPendingOrganizationInvitationsRequest {
 
     /**
@@ -30,7 +31,7 @@ public class ListPendingOrganizationInvitationsRequest {
      * Can be used for paginating the results together with `offset`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=limit")
-    private Optional<? extends Long> limit;
+    private Optional<Long> limit;
 
     /**
      * Skip the first `offset` results when paginating.
@@ -38,13 +39,13 @@ public class ListPendingOrganizationInvitationsRequest {
      * To be used in conjunction with `limit`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=offset")
-    private Optional<? extends Long> offset;
+    private Optional<Long> offset;
 
     @JsonCreator
     public ListPendingOrganizationInvitationsRequest(
             String organizationId,
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) {
+            Optional<Long> limit,
+            Optional<Long> offset) {
         Utils.checkNotNull(organizationId, "organizationId");
         Utils.checkNotNull(limit, "limit");
         Utils.checkNotNull(offset, "offset");
@@ -70,10 +71,9 @@ public String organizationId() {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> limit() {
-        return (Optional<Long>) limit;
+        return limit;
     }
 
     /**
@@ -81,10 +81,9 @@ public Optional<Long> limit() {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> offset() {
-        return (Optional<Long>) offset;
+        return offset;
     }
 
     public final static Builder builder() {
@@ -114,7 +113,7 @@ public ListPendingOrganizationInvitationsRequest withLimit(long limit) {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    public ListPendingOrganizationInvitationsRequest withLimit(Optional<? extends Long> limit) {
+    public ListPendingOrganizationInvitationsRequest withLimit(Optional<Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -136,7 +135,7 @@ public ListPendingOrganizationInvitationsRequest withOffset(long offset) {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    public ListPendingOrganizationInvitationsRequest withOffset(Optional<? extends Long> offset) {
+    public ListPendingOrganizationInvitationsRequest withOffset(Optional<Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -152,14 +151,14 @@ public boolean equals(java.lang.Object o) {
         }
         ListPendingOrganizationInvitationsRequest other = (ListPendingOrganizationInvitationsRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.limit, other.limit) &&
-            java.util.Objects.deepEquals(this.offset, other.offset);
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.limit, other.limit) &&
+            Objects.deepEquals(this.offset, other.offset);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId,
             limit,
             offset);
@@ -177,9 +176,9 @@ public final static class Builder {
  
         private String organizationId;
  
-        private Optional<? extends Long> limit;
+        private Optional<Long> limit;
  
-        private Optional<? extends Long> offset;  
+        private Optional<Long> offset;  
         
         private Builder() {
           // force use of static builder() method
@@ -208,7 +207,7 @@ public Builder limit(long limit) {
          * Applies a limit to the number of results returned.
          * Can be used for paginating the results together with `offset`.
          */
-        public Builder limit(Optional<? extends Long> limit) {
+        public Builder limit(Optional<Long> limit) {
             Utils.checkNotNull(limit, "limit");
             this.limit = limit;
             return this;
@@ -230,7 +229,7 @@ public Builder offset(long offset) {
          * Needs to be an integer greater or equal to zero.
          * To be used in conjunction with `limit`.
          */
-        public Builder offset(Optional<? extends Long> offset) {
+        public Builder offset(Optional<Long> offset) {
             Utils.checkNotNull(offset, "offset");
             this.offset = offset;
             return this;
@@ -249,17 +248,17 @@ public ListPendingOrganizationInvitationsRequest build() {
                 offset);
         }
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
                 new LazySingletonValue<>(
                         "limit",
                         "10",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
                 new LazySingletonValue<>(
                         "offset",
                         "0",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListPendingOrganizationInvitationsRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/ListPendingOrganizationInvitationsRequestBuilder.java
index b649590..d997e04 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListPendingOrganizationInvitationsRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListPendingOrganizationInvitationsRequestBuilder.java
@@ -8,33 +8,29 @@
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.Long;
+import java.lang.String;
 import java.util.Optional;
 import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class ListPendingOrganizationInvitationsRequestBuilder {
 
     private String organizationId;
-    private Optional<? extends Long> limit = Utils.readDefaultOrConstValue(
+    private Optional<Long> limit = Utils.readDefaultOrConstValue(
                             "limit",
                             "10",
-                            new TypeReference<Optional<? extends Long>>() {});
-    private Optional<? extends Long> offset = Utils.readDefaultOrConstValue(
+                            new TypeReference<Optional<Long>>() {});
+    private Optional<Long> offset = Utils.readDefaultOrConstValue(
                             "offset",
                             "0",
-                            new TypeReference<Optional<? extends Long>>() {});
+                            new TypeReference<Optional<Long>>() {});
     private final SDKMethodInterfaces.MethodCallListPendingOrganizationInvitations sdk;
 
     public ListPendingOrganizationInvitationsRequestBuilder(SDKMethodInterfaces.MethodCallListPendingOrganizationInvitations sdk) {
         this.sdk = sdk;
     }
 
-    public ListPendingOrganizationInvitationsRequestBuilder organizationId(String organizationId) {
+    public ListPendingOrganizationInvitationsRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
@@ -46,7 +42,7 @@ public ListPendingOrganizationInvitationsRequestBuilder limit(long limit) {
         return this;
     }
 
-    public ListPendingOrganizationInvitationsRequestBuilder limit(Optional<? extends Long> limit) {
+    public ListPendingOrganizationInvitationsRequestBuilder limit(java.util.Optional<java.lang.Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -58,7 +54,7 @@ public ListPendingOrganizationInvitationsRequestBuilder offset(long offset) {
         return this;
     }
 
-    public ListPendingOrganizationInvitationsRequestBuilder offset(Optional<? extends Long> offset) {
+    public ListPendingOrganizationInvitationsRequestBuilder offset(java.util.Optional<java.lang.Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -99,15 +95,15 @@ public Stream<ListPendingOrganizationInvitationsResponse> callAsStream() {
         });
     }
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
             new LazySingletonValue<>(
                     "limit",
                     "10",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
             new LazySingletonValue<>(
                     "offset",
                     "0",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListPendingOrganizationInvitationsResponse.java b/src/main/java/com/clerk/backend_api/models/operations/ListPendingOrganizationInvitationsResponse.java
index 5200c46..b3f579c 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListPendingOrganizationInvitationsResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListPendingOrganizationInvitationsResponse.java
@@ -4,20 +4,26 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OrganizationInvitations;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
 import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 
-public class ListPendingOrganizationInvitationsResponse implements com.clerk.backend_api.utils.Response {
+
+public class ListPendingOrganizationInvitationsResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -37,7 +43,7 @@ public class ListPendingOrganizationInvitationsResponse implements com.clerk.bac
     /**
      * A list of organization invitations
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations;
+    private Optional<? extends OrganizationInvitations> organizationInvitations;
 
     private Callable<Optional<ListPendingOrganizationInvitationsResponse>> next = () -> Optional.empty();
 
@@ -46,7 +52,7 @@ public ListPendingOrganizationInvitationsResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations) {
+            Optional<? extends OrganizationInvitations> organizationInvitations) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -93,8 +99,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations() {
-        return (Optional<com.clerk.backend_api.models.components.OrganizationInvitations>) organizationInvitations;
+    public Optional<OrganizationInvitations> organizationInvitations() {
+        return (Optional<OrganizationInvitations>) organizationInvitations;
     }
 
     public Optional<ListPendingOrganizationInvitationsResponse> next() throws Exception {
@@ -141,7 +147,7 @@ public ListPendingOrganizationInvitationsResponse withRawResponse(HttpResponse<I
     /**
      * A list of organization invitations
      */
-    public ListPendingOrganizationInvitationsResponse withOrganizationInvitations(com.clerk.backend_api.models.components.OrganizationInvitations organizationInvitations) {
+    public ListPendingOrganizationInvitationsResponse withOrganizationInvitations(OrganizationInvitations organizationInvitations) {
         Utils.checkNotNull(organizationInvitations, "organizationInvitations");
         this.organizationInvitations = Optional.ofNullable(organizationInvitations);
         return this;
@@ -150,7 +156,7 @@ public ListPendingOrganizationInvitationsResponse withOrganizationInvitations(co
     /**
      * A list of organization invitations
      */
-    public ListPendingOrganizationInvitationsResponse withOrganizationInvitations(Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations) {
+    public ListPendingOrganizationInvitationsResponse withOrganizationInvitations(Optional<? extends OrganizationInvitations> organizationInvitations) {
         Utils.checkNotNull(organizationInvitations, "organizationInvitations");
         this.organizationInvitations = organizationInvitations;
         return this;
@@ -166,15 +172,15 @@ public boolean equals(java.lang.Object o) {
         }
         ListPendingOrganizationInvitationsResponse other = (ListPendingOrganizationInvitationsResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizationInvitations, other.organizationInvitations);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizationInvitations, other.organizationInvitations);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -199,7 +205,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations = Optional.empty();  
+        private Optional<? extends OrganizationInvitations> organizationInvitations = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -235,7 +241,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A list of organization invitations
          */
-        public Builder organizationInvitations(com.clerk.backend_api.models.components.OrganizationInvitations organizationInvitations) {
+        public Builder organizationInvitations(OrganizationInvitations organizationInvitations) {
             Utils.checkNotNull(organizationInvitations, "organizationInvitations");
             this.organizationInvitations = Optional.ofNullable(organizationInvitations);
             return this;
@@ -244,7 +250,7 @@ public Builder organizationInvitations(com.clerk.backend_api.models.components.O
         /**
          * A list of organization invitations
          */
-        public Builder organizationInvitations(Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitations> organizationInvitations) {
+        public Builder organizationInvitations(Optional<? extends OrganizationInvitations> organizationInvitations) {
             Utils.checkNotNull(organizationInvitations, "organizationInvitations");
             this.organizationInvitations = organizationInvitations;
             return this;
@@ -253,7 +259,7 @@ public Builder organizationInvitations(Optional<? extends com.clerk.backend_api.
         /**
          * Internal API. Not for public use. Sets the provider of the next page.
          *
-         * @deprecated not part of the public API, may be removed without notice
+         * @Deprecated not part of the public API, may be removed without notice
          */
         @Deprecated
         public Builder next(Callable<Optional<ListPendingOrganizationInvitationsResponse>> next) {
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListRedirectURLsRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/ListRedirectURLsRequestBuilder.java
index 4e24652..0a796eb 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListRedirectURLsRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListRedirectURLsRequestBuilder.java
@@ -4,18 +4,6 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class ListRedirectURLsRequestBuilder {
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListRedirectURLsResponse.java b/src/main/java/com/clerk/backend_api/models/operations/ListRedirectURLsResponse.java
index 4d34f8e..329917d 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListRedirectURLsResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListRedirectURLsResponse.java
@@ -4,19 +4,24 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.RedirectURL;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
-public class ListRedirectURLsResponse implements com.clerk.backend_api.utils.Response {
+
+public class ListRedirectURLsResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +41,14 @@ public class ListRedirectURLsResponse implements com.clerk.backend_api.utils.Res
     /**
      * List of Redirect URLs
      */
-    private Optional<? extends java.util.List<com.clerk.backend_api.models.components.RedirectURL>> redirectURLList;
+    private Optional<? extends List<RedirectURL>> redirectURLList;
 
     @JsonCreator
     public ListRedirectURLsResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends java.util.List<com.clerk.backend_api.models.components.RedirectURL>> redirectURLList) {
+            Optional<? extends List<RedirectURL>> redirectURLList) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +95,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<com.clerk.backend_api.models.components.RedirectURL>> redirectURLList() {
-        return (Optional<java.util.List<com.clerk.backend_api.models.components.RedirectURL>>) redirectURLList;
+    public Optional<List<RedirectURL>> redirectURLList() {
+        return (Optional<List<RedirectURL>>) redirectURLList;
     }
 
     public final static Builder builder() {
@@ -128,7 +133,7 @@ public ListRedirectURLsResponse withRawResponse(HttpResponse<InputStream> rawRes
     /**
      * List of Redirect URLs
      */
-    public ListRedirectURLsResponse withRedirectURLList(java.util.List<com.clerk.backend_api.models.components.RedirectURL> redirectURLList) {
+    public ListRedirectURLsResponse withRedirectURLList(List<RedirectURL> redirectURLList) {
         Utils.checkNotNull(redirectURLList, "redirectURLList");
         this.redirectURLList = Optional.ofNullable(redirectURLList);
         return this;
@@ -137,7 +142,7 @@ public ListRedirectURLsResponse withRedirectURLList(java.util.List<com.clerk.bac
     /**
      * List of Redirect URLs
      */
-    public ListRedirectURLsResponse withRedirectURLList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.RedirectURL>> redirectURLList) {
+    public ListRedirectURLsResponse withRedirectURLList(Optional<? extends List<RedirectURL>> redirectURLList) {
         Utils.checkNotNull(redirectURLList, "redirectURLList");
         this.redirectURLList = redirectURLList;
         return this;
@@ -153,15 +158,15 @@ public boolean equals(java.lang.Object o) {
         }
         ListRedirectURLsResponse other = (ListRedirectURLsResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.redirectURLList, other.redirectURLList);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.redirectURLList, other.redirectURLList);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +190,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends java.util.List<com.clerk.backend_api.models.components.RedirectURL>> redirectURLList = Optional.empty();  
+        private Optional<? extends List<RedirectURL>> redirectURLList = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +226,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * List of Redirect URLs
          */
-        public Builder redirectURLList(java.util.List<com.clerk.backend_api.models.components.RedirectURL> redirectURLList) {
+        public Builder redirectURLList(List<RedirectURL> redirectURLList) {
             Utils.checkNotNull(redirectURLList, "redirectURLList");
             this.redirectURLList = Optional.ofNullable(redirectURLList);
             return this;
@@ -230,7 +235,7 @@ public Builder redirectURLList(java.util.List<com.clerk.backend_api.models.compo
         /**
          * List of Redirect URLs
          */
-        public Builder redirectURLList(Optional<? extends java.util.List<com.clerk.backend_api.models.components.RedirectURL>> redirectURLList) {
+        public Builder redirectURLList(Optional<? extends List<RedirectURL>> redirectURLList) {
             Utils.checkNotNull(redirectURLList, "redirectURLList");
             this.redirectURLList = redirectURLList;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListSAMLConnectionsRequest.java b/src/main/java/com/clerk/backend_api/models/operations/ListSAMLConnectionsRequest.java
index e4c2506..45c7f7c 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListSAMLConnectionsRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListSAMLConnectionsRequest.java
@@ -4,19 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class ListSAMLConnectionsRequest {
 
     /**
@@ -24,7 +25,7 @@ public class ListSAMLConnectionsRequest {
      * Can be used for paginating the results together with `offset`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=limit")
-    private Optional<? extends Long> limit;
+    private Optional<Long> limit;
 
     /**
      * Skip the first `offset` results when paginating.
@@ -32,12 +33,12 @@ public class ListSAMLConnectionsRequest {
      * To be used in conjunction with `limit`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=offset")
-    private Optional<? extends Long> offset;
+    private Optional<Long> offset;
 
     @JsonCreator
     public ListSAMLConnectionsRequest(
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) {
+            Optional<Long> limit,
+            Optional<Long> offset) {
         Utils.checkNotNull(limit, "limit");
         Utils.checkNotNull(offset, "offset");
         this.limit = limit;
@@ -52,10 +53,9 @@ public ListSAMLConnectionsRequest() {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> limit() {
-        return (Optional<Long>) limit;
+        return limit;
     }
 
     /**
@@ -63,10 +63,9 @@ public Optional<Long> limit() {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> offset() {
-        return (Optional<Long>) offset;
+        return offset;
     }
 
     public final static Builder builder() {
@@ -87,7 +86,7 @@ public ListSAMLConnectionsRequest withLimit(long limit) {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    public ListSAMLConnectionsRequest withLimit(Optional<? extends Long> limit) {
+    public ListSAMLConnectionsRequest withLimit(Optional<Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -109,7 +108,7 @@ public ListSAMLConnectionsRequest withOffset(long offset) {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    public ListSAMLConnectionsRequest withOffset(Optional<? extends Long> offset) {
+    public ListSAMLConnectionsRequest withOffset(Optional<Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -125,13 +124,13 @@ public boolean equals(java.lang.Object o) {
         }
         ListSAMLConnectionsRequest other = (ListSAMLConnectionsRequest) o;
         return 
-            java.util.Objects.deepEquals(this.limit, other.limit) &&
-            java.util.Objects.deepEquals(this.offset, other.offset);
+            Objects.deepEquals(this.limit, other.limit) &&
+            Objects.deepEquals(this.offset, other.offset);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             limit,
             offset);
     }
@@ -145,9 +144,9 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends Long> limit;
+        private Optional<Long> limit;
  
-        private Optional<? extends Long> offset;  
+        private Optional<Long> offset;  
         
         private Builder() {
           // force use of static builder() method
@@ -167,7 +166,7 @@ public Builder limit(long limit) {
          * Applies a limit to the number of results returned.
          * Can be used for paginating the results together with `offset`.
          */
-        public Builder limit(Optional<? extends Long> limit) {
+        public Builder limit(Optional<Long> limit) {
             Utils.checkNotNull(limit, "limit");
             this.limit = limit;
             return this;
@@ -189,7 +188,7 @@ public Builder offset(long offset) {
          * Needs to be an integer greater or equal to zero.
          * To be used in conjunction with `limit`.
          */
-        public Builder offset(Optional<? extends Long> offset) {
+        public Builder offset(Optional<Long> offset) {
             Utils.checkNotNull(offset, "offset");
             this.offset = offset;
             return this;
@@ -207,17 +206,17 @@ public ListSAMLConnectionsRequest build() {
                 offset);
         }
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
                 new LazySingletonValue<>(
                         "limit",
                         "10",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
                 new LazySingletonValue<>(
                         "offset",
                         "0",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListSAMLConnectionsRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/ListSAMLConnectionsRequestBuilder.java
index 0549e6a..2555609 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListSAMLConnectionsRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListSAMLConnectionsRequestBuilder.java
@@ -8,25 +8,20 @@
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.Long;
 import java.util.Optional;
 import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class ListSAMLConnectionsRequestBuilder {
 
-    private Optional<? extends Long> limit = Utils.readDefaultOrConstValue(
+    private Optional<Long> limit = Utils.readDefaultOrConstValue(
                             "limit",
                             "10",
-                            new TypeReference<Optional<? extends Long>>() {});
-    private Optional<? extends Long> offset = Utils.readDefaultOrConstValue(
+                            new TypeReference<Optional<Long>>() {});
+    private Optional<Long> offset = Utils.readDefaultOrConstValue(
                             "offset",
                             "0",
-                            new TypeReference<Optional<? extends Long>>() {});
+                            new TypeReference<Optional<Long>>() {});
     private final SDKMethodInterfaces.MethodCallListSAMLConnections sdk;
 
     public ListSAMLConnectionsRequestBuilder(SDKMethodInterfaces.MethodCallListSAMLConnections sdk) {
@@ -39,7 +34,7 @@ public ListSAMLConnectionsRequestBuilder limit(long limit) {
         return this;
     }
 
-    public ListSAMLConnectionsRequestBuilder limit(Optional<? extends Long> limit) {
+    public ListSAMLConnectionsRequestBuilder limit(java.util.Optional<java.lang.Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -51,7 +46,7 @@ public ListSAMLConnectionsRequestBuilder offset(long offset) {
         return this;
     }
 
-    public ListSAMLConnectionsRequestBuilder offset(Optional<? extends Long> offset) {
+    public ListSAMLConnectionsRequestBuilder offset(java.util.Optional<java.lang.Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -91,15 +86,15 @@ public Stream<ListSAMLConnectionsResponse> callAsStream() {
         });
     }
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
             new LazySingletonValue<>(
                     "limit",
                     "10",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
             new LazySingletonValue<>(
                     "offset",
                     "0",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ListSAMLConnectionsResponse.java b/src/main/java/com/clerk/backend_api/models/operations/ListSAMLConnectionsResponse.java
index 33afebc..0430230 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ListSAMLConnectionsResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ListSAMLConnectionsResponse.java
@@ -4,20 +4,26 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.SAMLConnections;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
 import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 
-public class ListSAMLConnectionsResponse implements com.clerk.backend_api.utils.Response {
+
+public class ListSAMLConnectionsResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -37,7 +43,7 @@ public class ListSAMLConnectionsResponse implements com.clerk.backend_api.utils.
     /**
      * A list of SAML Connections
      */
-    private Optional<? extends com.clerk.backend_api.models.components.SAMLConnections> samlConnections;
+    private Optional<? extends SAMLConnections> samlConnections;
 
     private Callable<Optional<ListSAMLConnectionsResponse>> next = () -> Optional.empty();
 
@@ -46,7 +52,7 @@ public ListSAMLConnectionsResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.SAMLConnections> samlConnections) {
+            Optional<? extends SAMLConnections> samlConnections) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -93,8 +99,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.SAMLConnections> samlConnections() {
-        return (Optional<com.clerk.backend_api.models.components.SAMLConnections>) samlConnections;
+    public Optional<SAMLConnections> samlConnections() {
+        return (Optional<SAMLConnections>) samlConnections;
     }
 
     public Optional<ListSAMLConnectionsResponse> next() throws Exception {
@@ -141,7 +147,7 @@ public ListSAMLConnectionsResponse withRawResponse(HttpResponse<InputStream> raw
     /**
      * A list of SAML Connections
      */
-    public ListSAMLConnectionsResponse withSAMLConnections(com.clerk.backend_api.models.components.SAMLConnections samlConnections) {
+    public ListSAMLConnectionsResponse withSAMLConnections(SAMLConnections samlConnections) {
         Utils.checkNotNull(samlConnections, "samlConnections");
         this.samlConnections = Optional.ofNullable(samlConnections);
         return this;
@@ -150,7 +156,7 @@ public ListSAMLConnectionsResponse withSAMLConnections(com.clerk.backend_api.mod
     /**
      * A list of SAML Connections
      */
-    public ListSAMLConnectionsResponse withSAMLConnections(Optional<? extends com.clerk.backend_api.models.components.SAMLConnections> samlConnections) {
+    public ListSAMLConnectionsResponse withSAMLConnections(Optional<? extends SAMLConnections> samlConnections) {
         Utils.checkNotNull(samlConnections, "samlConnections");
         this.samlConnections = samlConnections;
         return this;
@@ -166,15 +172,15 @@ public boolean equals(java.lang.Object o) {
         }
         ListSAMLConnectionsResponse other = (ListSAMLConnectionsResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.samlConnections, other.samlConnections);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.samlConnections, other.samlConnections);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -199,7 +205,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.SAMLConnections> samlConnections = Optional.empty();  
+        private Optional<? extends SAMLConnections> samlConnections = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -235,7 +241,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A list of SAML Connections
          */
-        public Builder samlConnections(com.clerk.backend_api.models.components.SAMLConnections samlConnections) {
+        public Builder samlConnections(SAMLConnections samlConnections) {
             Utils.checkNotNull(samlConnections, "samlConnections");
             this.samlConnections = Optional.ofNullable(samlConnections);
             return this;
@@ -244,7 +250,7 @@ public Builder samlConnections(com.clerk.backend_api.models.components.SAMLConne
         /**
          * A list of SAML Connections
          */
-        public Builder samlConnections(Optional<? extends com.clerk.backend_api.models.components.SAMLConnections> samlConnections) {
+        public Builder samlConnections(Optional<? extends SAMLConnections> samlConnections) {
             Utils.checkNotNull(samlConnections, "samlConnections");
             this.samlConnections = samlConnections;
             return this;
@@ -253,7 +259,7 @@ public Builder samlConnections(Optional<? extends com.clerk.backend_api.models.c
         /**
          * Internal API. Not for public use. Sets the provider of the next page.
          *
-         * @deprecated not part of the public API, may be removed without notice
+         * @Deprecated not part of the public API, may be removed without notice
          */
         @Deprecated
         public Builder next(Callable<Optional<ListSAMLConnectionsResponse>> next) {
diff --git a/src/main/java/com/clerk/backend_api/models/operations/LockUserRequest.java b/src/main/java/com/clerk/backend_api/models/operations/LockUserRequest.java
index 18155d8..c2fa627 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/LockUserRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/LockUserRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class LockUserRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         LockUserRequest other = (LockUserRequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId);
+            Objects.deepEquals(this.userId, other.userId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/LockUserRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/LockUserRequestBuilder.java
index 916a2f8..a26e2c4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/LockUserRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/LockUserRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class LockUserRequestBuilder {
 
@@ -26,7 +16,7 @@ public LockUserRequestBuilder(SDKMethodInterfaces.MethodCallLockUser sdk) {
         this.sdk = sdk;
     }
 
-    public LockUserRequestBuilder userId(String userId) {
+    public LockUserRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/LockUserResponse.java b/src/main/java/com/clerk/backend_api/models/operations/LockUserResponse.java
index 15ecb6a..de52885 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/LockUserResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/LockUserResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.User;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class LockUserResponse implements com.clerk.backend_api.utils.Response {
+
+public class LockUserResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class LockUserResponse implements com.clerk.backend_api.utils.Response {
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.User> user;
+    private Optional<? extends User> user;
 
     @JsonCreator
     public LockUserResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.User> user) {
+            Optional<? extends User> user) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.User> user() {
-        return (Optional<com.clerk.backend_api.models.components.User>) user;
+    public Optional<User> user() {
+        return (Optional<User>) user;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public LockUserResponse withRawResponse(HttpResponse<InputStream> rawResponse) {
     /**
      * Success
      */
-    public LockUserResponse withUser(com.clerk.backend_api.models.components.User user) {
+    public LockUserResponse withUser(User user) {
         Utils.checkNotNull(user, "user");
         this.user = Optional.ofNullable(user);
         return this;
@@ -137,7 +141,7 @@ public LockUserResponse withUser(com.clerk.backend_api.models.components.User us
     /**
      * Success
      */
-    public LockUserResponse withUser(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+    public LockUserResponse withUser(Optional<? extends User> user) {
         Utils.checkNotNull(user, "user");
         this.user = user;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         LockUserResponse other = (LockUserResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.user, other.user);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.user, other.user);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.User> user = Optional.empty();  
+        private Optional<? extends User> user = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder user(com.clerk.backend_api.models.components.User user) {
+        public Builder user(User user) {
             Utils.checkNotNull(user, "user");
             this.user = Optional.ofNullable(user);
             return this;
@@ -230,7 +234,7 @@ public Builder user(com.clerk.backend_api.models.components.User user) {
         /**
          * Success
          */
-        public Builder user(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+        public Builder user(Optional<? extends User> user) {
             Utils.checkNotNull(user, "user");
             this.user = user;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataPrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataPrivateMetadata.java
index a9915ac..60dad7e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataPrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataPrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * MergeOrganizationMetadataPrivateMetadata - Metadata saved on the organization that is only visible to your backend.
  * The new object will be merged with the existing value.
@@ -43,7 +41,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataPublicMetadata.java
index ce337e9..d5a7c69 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * MergeOrganizationMetadataPublicMetadata - Metadata saved on the organization, that is visible to both your frontend and backend.
  * The new object will be merged with the existing value.
@@ -43,7 +41,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataRequest.java b/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataRequest.java
index db5cda1..54b69cc 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class MergeOrganizationMetadataRequest {
 
@@ -78,13 +77,13 @@ public boolean equals(java.lang.Object o) {
         }
         MergeOrganizationMetadataRequest other = (MergeOrganizationMetadataRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataRequestBody.java
index 0602f01..0284169 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataRequestBody.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class MergeOrganizationMetadataRequestBody {
 
     /**
@@ -124,13 +124,13 @@ public boolean equals(java.lang.Object o) {
         }
         MergeOrganizationMetadataRequestBody other = (MergeOrganizationMetadataRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata);
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             publicMetadata,
             privateMetadata);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataRequestBuilder.java
index edf747c..3b7da34 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class MergeOrganizationMetadataRequestBuilder {
 
@@ -27,13 +17,13 @@ public MergeOrganizationMetadataRequestBuilder(SDKMethodInterfaces.MethodCallMer
         this.sdk = sdk;
     }
 
-    public MergeOrganizationMetadataRequestBuilder organizationId(String organizationId) {
+    public MergeOrganizationMetadataRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
     }
 
-    public MergeOrganizationMetadataRequestBuilder requestBody(MergeOrganizationMetadataRequestBody requestBody) {
+    public MergeOrganizationMetadataRequestBuilder requestBody(com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataResponse.java b/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataResponse.java
index 2b0ff6d..41c2f45 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/MergeOrganizationMetadataResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Organization;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class MergeOrganizationMetadataResponse implements com.clerk.backend_api.utils.Response {
+
+public class MergeOrganizationMetadataResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class MergeOrganizationMetadataResponse implements com.clerk.backend_api.
     /**
      * An organization
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Organization> organization;
+    private Optional<? extends Organization> organization;
 
     @JsonCreator
     public MergeOrganizationMetadataResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+            Optional<? extends Organization> organization) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Organization> organization() {
-        return (Optional<com.clerk.backend_api.models.components.Organization>) organization;
+    public Optional<Organization> organization() {
+        return (Optional<Organization>) organization;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public MergeOrganizationMetadataResponse withRawResponse(HttpResponse<InputStrea
     /**
      * An organization
      */
-    public MergeOrganizationMetadataResponse withOrganization(com.clerk.backend_api.models.components.Organization organization) {
+    public MergeOrganizationMetadataResponse withOrganization(Organization organization) {
         Utils.checkNotNull(organization, "organization");
         this.organization = Optional.ofNullable(organization);
         return this;
@@ -137,7 +141,7 @@ public MergeOrganizationMetadataResponse withOrganization(com.clerk.backend_api.
     /**
      * An organization
      */
-    public MergeOrganizationMetadataResponse withOrganization(Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+    public MergeOrganizationMetadataResponse withOrganization(Optional<? extends Organization> organization) {
         Utils.checkNotNull(organization, "organization");
         this.organization = organization;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         MergeOrganizationMetadataResponse other = (MergeOrganizationMetadataResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organization, other.organization);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organization, other.organization);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Organization> organization = Optional.empty();  
+        private Optional<? extends Organization> organization = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * An organization
          */
-        public Builder organization(com.clerk.backend_api.models.components.Organization organization) {
+        public Builder organization(Organization organization) {
             Utils.checkNotNull(organization, "organization");
             this.organization = Optional.ofNullable(organization);
             return this;
@@ -230,7 +234,7 @@ public Builder organization(com.clerk.backend_api.models.components.Organization
         /**
          * An organization
          */
-        public Builder organization(Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+        public Builder organization(Optional<? extends Organization> organization) {
             Utils.checkNotNull(organization, "organization");
             this.organization = organization;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/Object.java b/src/main/java/com/clerk/backend_api/models/operations/Object.java
index ed99589..53452b9 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/Object.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/Object.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 public enum Object {
     TOKEN("token");
diff --git a/src/main/java/com/clerk/backend_api/models/operations/PasswordHasher.java b/src/main/java/com/clerk/backend_api/models/operations/PasswordHasher.java
index b3018b3..c0170f4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/PasswordHasher.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/PasswordHasher.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * PasswordHasher - The hashing algorithm that was used to generate the password digest.
diff --git a/src/main/java/com/clerk/backend_api/models/operations/PathParamTemplateType.java b/src/main/java/com/clerk/backend_api/models/operations/PathParamTemplateType.java
index 89d697b..f46459a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/PathParamTemplateType.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/PathParamTemplateType.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * PathParamTemplateType - The type of templates to retrieve (email or SMS)
diff --git a/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateRequest.java b/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateRequest.java
index b22f650..3b4114f 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateRequest.java
@@ -4,18 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class PreviewTemplateRequest {
 
     /**
@@ -130,14 +130,14 @@ public boolean equals(java.lang.Object o) {
         }
         PreviewTemplateRequest other = (PreviewTemplateRequest) o;
         return 
-            java.util.Objects.deepEquals(this.templateType, other.templateType) &&
-            java.util.Objects.deepEquals(this.slug, other.slug) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.templateType, other.templateType) &&
+            Objects.deepEquals(this.slug, other.slug) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             templateType,
             slug,
             requestBody);
diff --git a/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateRequestBody.java
index 04ecbe2..2646679 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateRequestBody.java
@@ -4,20 +4,19 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
+
 /**
  * PreviewTemplateRequestBody - Required parameters
  */
@@ -30,14 +29,14 @@ public class PreviewTemplateRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("subject")
-    private JsonNullable<? extends String> subject;
+    private JsonNullable<String> subject;
 
     /**
      * The template body before variable interpolation
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("body")
-    private Optional<? extends String> body;
+    private Optional<String> body;
 
     /**
      * The local part of the From email address that will be used for emails.
@@ -46,7 +45,7 @@ public class PreviewTemplateRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("from_email_name")
-    private Optional<? extends String> fromEmailName;
+    private Optional<String> fromEmailName;
 
     /**
      * The local part of the Reply To email address that will be used for emails.
@@ -55,14 +54,14 @@ public class PreviewTemplateRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("reply_to_email_name")
-    private Optional<? extends String> replyToEmailName;
+    private Optional<String> replyToEmailName;
 
     @JsonCreator
     public PreviewTemplateRequestBody(
-            @JsonProperty("subject") JsonNullable<? extends String> subject,
-            @JsonProperty("body") Optional<? extends String> body,
-            @JsonProperty("from_email_name") Optional<? extends String> fromEmailName,
-            @JsonProperty("reply_to_email_name") Optional<? extends String> replyToEmailName) {
+            @JsonProperty("subject") JsonNullable<String> subject,
+            @JsonProperty("body") Optional<String> body,
+            @JsonProperty("from_email_name") Optional<String> fromEmailName,
+            @JsonProperty("reply_to_email_name") Optional<String> replyToEmailName) {
         Utils.checkNotNull(subject, "subject");
         Utils.checkNotNull(body, "body");
         Utils.checkNotNull(fromEmailName, "fromEmailName");
@@ -81,19 +80,17 @@ public PreviewTemplateRequestBody() {
      * The email subject.
      * Applicable only to email templates.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> subject() {
-        return (JsonNullable<String>) subject;
+        return subject;
     }
 
     /**
      * The template body before variable interpolation
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> body() {
-        return (Optional<String>) body;
+        return body;
     }
 
     /**
@@ -101,10 +98,9 @@ public Optional<String> body() {
      * For example, in the address 'hello@example.com', the local part is 'hello'.
      * Applicable only to email templates.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> fromEmailName() {
-        return (Optional<String>) fromEmailName;
+        return fromEmailName;
     }
 
     /**
@@ -112,10 +108,9 @@ public Optional<String> fromEmailName() {
      * For example, in the address 'hello@example.com', the local part is 'hello'.
      * Applicable only to email templates.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> replyToEmailName() {
-        return (Optional<String>) replyToEmailName;
+        return replyToEmailName;
     }
 
     public final static Builder builder() {
@@ -136,7 +131,7 @@ public PreviewTemplateRequestBody withSubject(String subject) {
      * The email subject.
      * Applicable only to email templates.
      */
-    public PreviewTemplateRequestBody withSubject(JsonNullable<? extends String> subject) {
+    public PreviewTemplateRequestBody withSubject(JsonNullable<String> subject) {
         Utils.checkNotNull(subject, "subject");
         this.subject = subject;
         return this;
@@ -154,7 +149,7 @@ public PreviewTemplateRequestBody withBody(String body) {
     /**
      * The template body before variable interpolation
      */
-    public PreviewTemplateRequestBody withBody(Optional<? extends String> body) {
+    public PreviewTemplateRequestBody withBody(Optional<String> body) {
         Utils.checkNotNull(body, "body");
         this.body = body;
         return this;
@@ -176,7 +171,7 @@ public PreviewTemplateRequestBody withFromEmailName(String fromEmailName) {
      * For example, in the address 'hello@example.com', the local part is 'hello'.
      * Applicable only to email templates.
      */
-    public PreviewTemplateRequestBody withFromEmailName(Optional<? extends String> fromEmailName) {
+    public PreviewTemplateRequestBody withFromEmailName(Optional<String> fromEmailName) {
         Utils.checkNotNull(fromEmailName, "fromEmailName");
         this.fromEmailName = fromEmailName;
         return this;
@@ -198,7 +193,7 @@ public PreviewTemplateRequestBody withReplyToEmailName(String replyToEmailName)
      * For example, in the address 'hello@example.com', the local part is 'hello'.
      * Applicable only to email templates.
      */
-    public PreviewTemplateRequestBody withReplyToEmailName(Optional<? extends String> replyToEmailName) {
+    public PreviewTemplateRequestBody withReplyToEmailName(Optional<String> replyToEmailName) {
         Utils.checkNotNull(replyToEmailName, "replyToEmailName");
         this.replyToEmailName = replyToEmailName;
         return this;
@@ -214,15 +209,15 @@ public boolean equals(java.lang.Object o) {
         }
         PreviewTemplateRequestBody other = (PreviewTemplateRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.subject, other.subject) &&
-            java.util.Objects.deepEquals(this.body, other.body) &&
-            java.util.Objects.deepEquals(this.fromEmailName, other.fromEmailName) &&
-            java.util.Objects.deepEquals(this.replyToEmailName, other.replyToEmailName);
+            Objects.deepEquals(this.subject, other.subject) &&
+            Objects.deepEquals(this.body, other.body) &&
+            Objects.deepEquals(this.fromEmailName, other.fromEmailName) &&
+            Objects.deepEquals(this.replyToEmailName, other.replyToEmailName);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             subject,
             body,
             fromEmailName,
@@ -240,13 +235,13 @@ public String toString() {
     
     public final static class Builder {
  
-        private JsonNullable<? extends String> subject = JsonNullable.undefined();
+        private JsonNullable<String> subject = JsonNullable.undefined();
  
-        private Optional<? extends String> body = Optional.empty();
+        private Optional<String> body = Optional.empty();
  
-        private Optional<? extends String> fromEmailName = Optional.empty();
+        private Optional<String> fromEmailName = Optional.empty();
  
-        private Optional<? extends String> replyToEmailName = Optional.empty();  
+        private Optional<String> replyToEmailName = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -266,7 +261,7 @@ public Builder subject(String subject) {
          * The email subject.
          * Applicable only to email templates.
          */
-        public Builder subject(JsonNullable<? extends String> subject) {
+        public Builder subject(JsonNullable<String> subject) {
             Utils.checkNotNull(subject, "subject");
             this.subject = subject;
             return this;
@@ -284,7 +279,7 @@ public Builder body(String body) {
         /**
          * The template body before variable interpolation
          */
-        public Builder body(Optional<? extends String> body) {
+        public Builder body(Optional<String> body) {
             Utils.checkNotNull(body, "body");
             this.body = body;
             return this;
@@ -306,7 +301,7 @@ public Builder fromEmailName(String fromEmailName) {
          * For example, in the address 'hello@example.com', the local part is 'hello'.
          * Applicable only to email templates.
          */
-        public Builder fromEmailName(Optional<? extends String> fromEmailName) {
+        public Builder fromEmailName(Optional<String> fromEmailName) {
             Utils.checkNotNull(fromEmailName, "fromEmailName");
             this.fromEmailName = fromEmailName;
             return this;
@@ -328,7 +323,7 @@ public Builder replyToEmailName(String replyToEmailName) {
          * For example, in the address 'hello@example.com', the local part is 'hello'.
          * Applicable only to email templates.
          */
-        public Builder replyToEmailName(Optional<? extends String> replyToEmailName) {
+        public Builder replyToEmailName(Optional<String> replyToEmailName) {
             Utils.checkNotNull(replyToEmailName, "replyToEmailName");
             this.replyToEmailName = replyToEmailName;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateRequestBuilder.java
index 26285e9..5e173c8 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateRequestBuilder.java
@@ -4,18 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.String;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class PreviewTemplateRequestBuilder {
 
@@ -28,25 +19,25 @@ public PreviewTemplateRequestBuilder(SDKMethodInterfaces.MethodCallPreviewTempla
         this.sdk = sdk;
     }
 
-    public PreviewTemplateRequestBuilder templateType(String templateType) {
+    public PreviewTemplateRequestBuilder templateType(java.lang.String templateType) {
         Utils.checkNotNull(templateType, "templateType");
         this.templateType = templateType;
         return this;
     }
 
-    public PreviewTemplateRequestBuilder slug(String slug) {
+    public PreviewTemplateRequestBuilder slug(java.lang.String slug) {
         Utils.checkNotNull(slug, "slug");
         this.slug = slug;
         return this;
     }
                 
-    public PreviewTemplateRequestBuilder requestBody(PreviewTemplateRequestBody requestBody) {
+    public PreviewTemplateRequestBuilder requestBody(com.clerk.backend_api.models.operations.PreviewTemplateRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = Optional.of(requestBody);
         return this;
     }
 
-    public PreviewTemplateRequestBuilder requestBody(Optional<? extends PreviewTemplateRequestBody> requestBody) {
+    public PreviewTemplateRequestBuilder requestBody(java.util.Optional<? extends com.clerk.backend_api.models.operations.PreviewTemplateRequestBody> requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateResponse.java b/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateResponse.java
index 27126ee..d4af37a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateResponse.java
@@ -4,19 +4,22 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class PreviewTemplateResponse implements com.clerk.backend_api.utils.Response {
+
+public class PreviewTemplateResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -153,15 +156,15 @@ public boolean equals(java.lang.Object o) {
         }
         PreviewTemplateResponse other = (PreviewTemplateResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.object, other.object);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.object, other.object);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
diff --git a/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateResponseBody.java b/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateResponseBody.java
index 43fbf14..072118f 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateResponseBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/PreviewTemplateResponseBody.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * PreviewTemplateResponseBody - OK
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/PrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/PrivateMetadata.java
index f90d740..5122a95 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/PrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/PrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * PrivateMetadata - Metadata saved on the user, that is only visible to your Backend API
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/Provider.java b/src/main/java/com/clerk/backend_api/models/operations/Provider.java
index 408256c..a778b94 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/Provider.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/Provider.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * Provider - The IdP provider of the connection.
diff --git a/src/main/java/com/clerk/backend_api/models/operations/PublicMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/PublicMetadata.java
index 31f6273..af3d609 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/PublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/PublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * PublicMetadata - Metadata saved on the user, that is visible to both your Frontend and Backend APIs
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/QueryParamStatus.java b/src/main/java/com/clerk/backend_api/models/operations/QueryParamStatus.java
index f8d0b99..e58e641 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/QueryParamStatus.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/QueryParamStatus.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * QueryParamStatus - Filter invitations based on their status
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/RequestBody.java
index fcee74c..2db6fd6 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RequestBody.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class RequestBody {
 
     /**
@@ -58,7 +58,7 @@ public class RequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("redirect_url")
-    private Optional<? extends String> redirectUrl;
+    private Optional<String> redirectUrl;
 
     @JsonCreator
     public RequestBody(
@@ -67,7 +67,7 @@ public RequestBody(
             @JsonProperty("role") String role,
             @JsonProperty("public_metadata") Optional<? extends CreateOrganizationInvitationBulkPublicMetadata> publicMetadata,
             @JsonProperty("private_metadata") Optional<? extends CreateOrganizationInvitationBulkPrivateMetadata> privateMetadata,
-            @JsonProperty("redirect_url") Optional<? extends String> redirectUrl) {
+            @JsonProperty("redirect_url") Optional<String> redirectUrl) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         Utils.checkNotNull(inviterUserId, "inviterUserId");
         Utils.checkNotNull(role, "role");
@@ -135,10 +135,9 @@ public Optional<CreateOrganizationInvitationBulkPrivateMetadata> privateMetadata
     /**
      * Optional URL that the invitee will be redirected to once they accept the invitation by clicking the join link in the invitation email.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> redirectUrl() {
-        return (Optional<String>) redirectUrl;
+        return redirectUrl;
     }
 
     public final static Builder builder() {
@@ -221,7 +220,7 @@ public RequestBody withRedirectUrl(String redirectUrl) {
     /**
      * Optional URL that the invitee will be redirected to once they accept the invitation by clicking the join link in the invitation email.
      */
-    public RequestBody withRedirectUrl(Optional<? extends String> redirectUrl) {
+    public RequestBody withRedirectUrl(Optional<String> redirectUrl) {
         Utils.checkNotNull(redirectUrl, "redirectUrl");
         this.redirectUrl = redirectUrl;
         return this;
@@ -237,17 +236,17 @@ public boolean equals(java.lang.Object o) {
         }
         RequestBody other = (RequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.inviterUserId, other.inviterUserId) &&
-            java.util.Objects.deepEquals(this.role, other.role) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
-            java.util.Objects.deepEquals(this.redirectUrl, other.redirectUrl);
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.inviterUserId, other.inviterUserId) &&
+            Objects.deepEquals(this.role, other.role) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
+            Objects.deepEquals(this.redirectUrl, other.redirectUrl);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             emailAddress,
             inviterUserId,
             role,
@@ -279,7 +278,7 @@ public final static class Builder {
  
         private Optional<? extends CreateOrganizationInvitationBulkPrivateMetadata> privateMetadata = Optional.empty();
  
-        private Optional<? extends String> redirectUrl = Optional.empty();  
+        private Optional<String> redirectUrl = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -361,7 +360,7 @@ public Builder redirectUrl(String redirectUrl) {
         /**
          * Optional URL that the invitee will be redirected to once they accept the invitation by clicking the join link in the invitation email.
          */
-        public Builder redirectUrl(Optional<? extends String> redirectUrl) {
+        public Builder redirectUrl(Optional<String> redirectUrl) {
             Utils.checkNotNull(redirectUrl, "redirectUrl");
             this.redirectUrl = redirectUrl;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ResponseBody.java b/src/main/java/com/clerk/backend_api/models/operations/ResponseBody.java
index f372cc5..9ad25a1 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ResponseBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ResponseBody.java
@@ -4,54 +4,55 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class ResponseBody {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("object")
-    private Optional<? extends String> object;
+    private Optional<String> object;
 
     /**
      * External account ID
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("external_account_id")
-    private Optional<? extends String> externalAccountId;
+    private Optional<String> externalAccountId;
 
     /**
      * The unique ID of the user in the external provider's system
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("provider_user_id")
-    private Optional<? extends String> providerUserId;
+    private Optional<String> providerUserId;
 
     /**
      * The access token
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("token")
-    private Optional<? extends String> token;
+    private Optional<String> token;
 
     /**
      * The ID of the provider
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("provider")
-    private Optional<? extends String> provider;
+    private Optional<String> provider;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("public_metadata")
@@ -59,7 +60,7 @@ public class ResponseBody {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("label")
-    private JsonNullable<? extends String> label;
+    private JsonNullable<String> label;
 
     /**
      * The list of scopes that the token is valid for.
@@ -67,26 +68,26 @@ public class ResponseBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("scopes")
-    private Optional<? extends java.util.List<String>> scopes;
+    private Optional<? extends List<String>> scopes;
 
     /**
      * The token secret. Only present for OAuth 1.0 tokens.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("token_secret")
-    private Optional<? extends String> tokenSecret;
+    private Optional<String> tokenSecret;
 
     @JsonCreator
     public ResponseBody(
-            @JsonProperty("object") Optional<? extends String> object,
-            @JsonProperty("external_account_id") Optional<? extends String> externalAccountId,
-            @JsonProperty("provider_user_id") Optional<? extends String> providerUserId,
-            @JsonProperty("token") Optional<? extends String> token,
-            @JsonProperty("provider") Optional<? extends String> provider,
+            @JsonProperty("object") Optional<String> object,
+            @JsonProperty("external_account_id") Optional<String> externalAccountId,
+            @JsonProperty("provider_user_id") Optional<String> providerUserId,
+            @JsonProperty("token") Optional<String> token,
+            @JsonProperty("provider") Optional<String> provider,
             @JsonProperty("public_metadata") Optional<? extends GetOAuthAccessTokenPublicMetadata> publicMetadata,
-            @JsonProperty("label") JsonNullable<? extends String> label,
-            @JsonProperty("scopes") Optional<? extends java.util.List<String>> scopes,
-            @JsonProperty("token_secret") Optional<? extends String> tokenSecret) {
+            @JsonProperty("label") JsonNullable<String> label,
+            @JsonProperty("scopes") Optional<? extends List<String>> scopes,
+            @JsonProperty("token_secret") Optional<String> tokenSecret) {
         Utils.checkNotNull(object, "object");
         Utils.checkNotNull(externalAccountId, "externalAccountId");
         Utils.checkNotNull(providerUserId, "providerUserId");
@@ -111,46 +112,41 @@ public ResponseBody() {
         this(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), JsonNullable.undefined(), Optional.empty(), Optional.empty());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> object() {
-        return (Optional<String>) object;
+        return object;
     }
 
     /**
      * External account ID
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> externalAccountId() {
-        return (Optional<String>) externalAccountId;
+        return externalAccountId;
     }
 
     /**
      * The unique ID of the user in the external provider's system
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> providerUserId() {
-        return (Optional<String>) providerUserId;
+        return providerUserId;
     }
 
     /**
      * The access token
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> token() {
-        return (Optional<String>) token;
+        return token;
     }
 
     /**
      * The ID of the provider
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> provider() {
-        return (Optional<String>) provider;
+        return provider;
     }
 
     @SuppressWarnings("unchecked")
@@ -159,10 +155,9 @@ public Optional<GetOAuthAccessTokenPublicMetadata> publicMetadata() {
         return (Optional<GetOAuthAccessTokenPublicMetadata>) publicMetadata;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> label() {
-        return (JsonNullable<String>) label;
+        return label;
     }
 
     /**
@@ -171,17 +166,16 @@ public JsonNullable<String> label() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> scopes() {
-        return (Optional<java.util.List<String>>) scopes;
+    public Optional<List<String>> scopes() {
+        return (Optional<List<String>>) scopes;
     }
 
     /**
      * The token secret. Only present for OAuth 1.0 tokens.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> tokenSecret() {
-        return (Optional<String>) tokenSecret;
+        return tokenSecret;
     }
 
     public final static Builder builder() {
@@ -194,7 +188,7 @@ public ResponseBody withObject(String object) {
         return this;
     }
 
-    public ResponseBody withObject(Optional<? extends String> object) {
+    public ResponseBody withObject(Optional<String> object) {
         Utils.checkNotNull(object, "object");
         this.object = object;
         return this;
@@ -212,7 +206,7 @@ public ResponseBody withExternalAccountId(String externalAccountId) {
     /**
      * External account ID
      */
-    public ResponseBody withExternalAccountId(Optional<? extends String> externalAccountId) {
+    public ResponseBody withExternalAccountId(Optional<String> externalAccountId) {
         Utils.checkNotNull(externalAccountId, "externalAccountId");
         this.externalAccountId = externalAccountId;
         return this;
@@ -230,7 +224,7 @@ public ResponseBody withProviderUserId(String providerUserId) {
     /**
      * The unique ID of the user in the external provider's system
      */
-    public ResponseBody withProviderUserId(Optional<? extends String> providerUserId) {
+    public ResponseBody withProviderUserId(Optional<String> providerUserId) {
         Utils.checkNotNull(providerUserId, "providerUserId");
         this.providerUserId = providerUserId;
         return this;
@@ -248,7 +242,7 @@ public ResponseBody withToken(String token) {
     /**
      * The access token
      */
-    public ResponseBody withToken(Optional<? extends String> token) {
+    public ResponseBody withToken(Optional<String> token) {
         Utils.checkNotNull(token, "token");
         this.token = token;
         return this;
@@ -266,7 +260,7 @@ public ResponseBody withProvider(String provider) {
     /**
      * The ID of the provider
      */
-    public ResponseBody withProvider(Optional<? extends String> provider) {
+    public ResponseBody withProvider(Optional<String> provider) {
         Utils.checkNotNull(provider, "provider");
         this.provider = provider;
         return this;
@@ -290,7 +284,7 @@ public ResponseBody withLabel(String label) {
         return this;
     }
 
-    public ResponseBody withLabel(JsonNullable<? extends String> label) {
+    public ResponseBody withLabel(JsonNullable<String> label) {
         Utils.checkNotNull(label, "label");
         this.label = label;
         return this;
@@ -300,7 +294,7 @@ public ResponseBody withLabel(JsonNullable<? extends String> label) {
      * The list of scopes that the token is valid for.
      * Only present for OAuth 2.0 tokens.
      */
-    public ResponseBody withScopes(java.util.List<String> scopes) {
+    public ResponseBody withScopes(List<String> scopes) {
         Utils.checkNotNull(scopes, "scopes");
         this.scopes = Optional.ofNullable(scopes);
         return this;
@@ -310,7 +304,7 @@ public ResponseBody withScopes(java.util.List<String> scopes) {
      * The list of scopes that the token is valid for.
      * Only present for OAuth 2.0 tokens.
      */
-    public ResponseBody withScopes(Optional<? extends java.util.List<String>> scopes) {
+    public ResponseBody withScopes(Optional<? extends List<String>> scopes) {
         Utils.checkNotNull(scopes, "scopes");
         this.scopes = scopes;
         return this;
@@ -328,7 +322,7 @@ public ResponseBody withTokenSecret(String tokenSecret) {
     /**
      * The token secret. Only present for OAuth 1.0 tokens.
      */
-    public ResponseBody withTokenSecret(Optional<? extends String> tokenSecret) {
+    public ResponseBody withTokenSecret(Optional<String> tokenSecret) {
         Utils.checkNotNull(tokenSecret, "tokenSecret");
         this.tokenSecret = tokenSecret;
         return this;
@@ -344,20 +338,20 @@ public boolean equals(java.lang.Object o) {
         }
         ResponseBody other = (ResponseBody) o;
         return 
-            java.util.Objects.deepEquals(this.object, other.object) &&
-            java.util.Objects.deepEquals(this.externalAccountId, other.externalAccountId) &&
-            java.util.Objects.deepEquals(this.providerUserId, other.providerUserId) &&
-            java.util.Objects.deepEquals(this.token, other.token) &&
-            java.util.Objects.deepEquals(this.provider, other.provider) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.label, other.label) &&
-            java.util.Objects.deepEquals(this.scopes, other.scopes) &&
-            java.util.Objects.deepEquals(this.tokenSecret, other.tokenSecret);
+            Objects.deepEquals(this.object, other.object) &&
+            Objects.deepEquals(this.externalAccountId, other.externalAccountId) &&
+            Objects.deepEquals(this.providerUserId, other.providerUserId) &&
+            Objects.deepEquals(this.token, other.token) &&
+            Objects.deepEquals(this.provider, other.provider) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.label, other.label) &&
+            Objects.deepEquals(this.scopes, other.scopes) &&
+            Objects.deepEquals(this.tokenSecret, other.tokenSecret);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             object,
             externalAccountId,
             providerUserId,
@@ -385,23 +379,23 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> object = Optional.empty();
+        private Optional<String> object = Optional.empty();
  
-        private Optional<? extends String> externalAccountId = Optional.empty();
+        private Optional<String> externalAccountId = Optional.empty();
  
-        private Optional<? extends String> providerUserId = Optional.empty();
+        private Optional<String> providerUserId = Optional.empty();
  
-        private Optional<? extends String> token = Optional.empty();
+        private Optional<String> token = Optional.empty();
  
-        private Optional<? extends String> provider = Optional.empty();
+        private Optional<String> provider = Optional.empty();
  
         private Optional<? extends GetOAuthAccessTokenPublicMetadata> publicMetadata = Optional.empty();
  
-        private JsonNullable<? extends String> label = JsonNullable.undefined();
+        private JsonNullable<String> label = JsonNullable.undefined();
  
-        private Optional<? extends java.util.List<String>> scopes = Optional.empty();
+        private Optional<? extends List<String>> scopes = Optional.empty();
  
-        private Optional<? extends String> tokenSecret = Optional.empty();  
+        private Optional<String> tokenSecret = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -413,7 +407,7 @@ public Builder object(String object) {
             return this;
         }
 
-        public Builder object(Optional<? extends String> object) {
+        public Builder object(Optional<String> object) {
             Utils.checkNotNull(object, "object");
             this.object = object;
             return this;
@@ -431,7 +425,7 @@ public Builder externalAccountId(String externalAccountId) {
         /**
          * External account ID
          */
-        public Builder externalAccountId(Optional<? extends String> externalAccountId) {
+        public Builder externalAccountId(Optional<String> externalAccountId) {
             Utils.checkNotNull(externalAccountId, "externalAccountId");
             this.externalAccountId = externalAccountId;
             return this;
@@ -449,7 +443,7 @@ public Builder providerUserId(String providerUserId) {
         /**
          * The unique ID of the user in the external provider's system
          */
-        public Builder providerUserId(Optional<? extends String> providerUserId) {
+        public Builder providerUserId(Optional<String> providerUserId) {
             Utils.checkNotNull(providerUserId, "providerUserId");
             this.providerUserId = providerUserId;
             return this;
@@ -467,7 +461,7 @@ public Builder token(String token) {
         /**
          * The access token
          */
-        public Builder token(Optional<? extends String> token) {
+        public Builder token(Optional<String> token) {
             Utils.checkNotNull(token, "token");
             this.token = token;
             return this;
@@ -485,7 +479,7 @@ public Builder provider(String provider) {
         /**
          * The ID of the provider
          */
-        public Builder provider(Optional<? extends String> provider) {
+        public Builder provider(Optional<String> provider) {
             Utils.checkNotNull(provider, "provider");
             this.provider = provider;
             return this;
@@ -509,7 +503,7 @@ public Builder label(String label) {
             return this;
         }
 
-        public Builder label(JsonNullable<? extends String> label) {
+        public Builder label(JsonNullable<String> label) {
             Utils.checkNotNull(label, "label");
             this.label = label;
             return this;
@@ -519,7 +513,7 @@ public Builder label(JsonNullable<? extends String> label) {
          * The list of scopes that the token is valid for.
          * Only present for OAuth 2.0 tokens.
          */
-        public Builder scopes(java.util.List<String> scopes) {
+        public Builder scopes(List<String> scopes) {
             Utils.checkNotNull(scopes, "scopes");
             this.scopes = Optional.ofNullable(scopes);
             return this;
@@ -529,7 +523,7 @@ public Builder scopes(java.util.List<String> scopes) {
          * The list of scopes that the token is valid for.
          * Only present for OAuth 2.0 tokens.
          */
-        public Builder scopes(Optional<? extends java.util.List<String>> scopes) {
+        public Builder scopes(Optional<? extends List<String>> scopes) {
             Utils.checkNotNull(scopes, "scopes");
             this.scopes = scopes;
             return this;
@@ -547,7 +541,7 @@ public Builder tokenSecret(String tokenSecret) {
         /**
          * The token secret. Only present for OAuth 1.0 tokens.
          */
-        public Builder tokenSecret(Optional<? extends String> tokenSecret) {
+        public Builder tokenSecret(Optional<String> tokenSecret) {
             Utils.checkNotNull(tokenSecret, "tokenSecret");
             this.tokenSecret = tokenSecret;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevertTemplatePathParamTemplateType.java b/src/main/java/com/clerk/backend_api/models/operations/RevertTemplatePathParamTemplateType.java
index d31a5db..8774893 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevertTemplatePathParamTemplateType.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevertTemplatePathParamTemplateType.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * RevertTemplatePathParamTemplateType - The type of template to revert
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevertTemplateRequest.java b/src/main/java/com/clerk/backend_api/models/operations/RevertTemplateRequest.java
index fa6d545..ccc7779 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevertTemplateRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevertTemplateRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class RevertTemplateRequest {
 
@@ -87,13 +86,13 @@ public boolean equals(java.lang.Object o) {
         }
         RevertTemplateRequest other = (RevertTemplateRequest) o;
         return 
-            java.util.Objects.deepEquals(this.templateType, other.templateType) &&
-            java.util.Objects.deepEquals(this.slug, other.slug);
+            Objects.deepEquals(this.templateType, other.templateType) &&
+            Objects.deepEquals(this.slug, other.slug);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             templateType,
             slug);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevertTemplateRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/RevertTemplateRequestBuilder.java
index a0615a3..ebbcf90 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevertTemplateRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevertTemplateRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class RevertTemplateRequestBuilder {
 
@@ -27,13 +17,13 @@ public RevertTemplateRequestBuilder(SDKMethodInterfaces.MethodCallRevertTemplate
         this.sdk = sdk;
     }
 
-    public RevertTemplateRequestBuilder templateType(RevertTemplatePathParamTemplateType templateType) {
+    public RevertTemplateRequestBuilder templateType(com.clerk.backend_api.models.operations.RevertTemplatePathParamTemplateType templateType) {
         Utils.checkNotNull(templateType, "templateType");
         this.templateType = templateType;
         return this;
     }
 
-    public RevertTemplateRequestBuilder slug(String slug) {
+    public RevertTemplateRequestBuilder slug(java.lang.String slug) {
         Utils.checkNotNull(slug, "slug");
         this.slug = slug;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevertTemplateResponse.java b/src/main/java/com/clerk/backend_api/models/operations/RevertTemplateResponse.java
index 6f291fd..02964d6 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevertTemplateResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevertTemplateResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Template;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class RevertTemplateResponse implements com.clerk.backend_api.utils.Response {
+
+public class RevertTemplateResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class RevertTemplateResponse implements com.clerk.backend_api.utils.Respo
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Template> template;
+    private Optional<? extends Template> template;
 
     @JsonCreator
     public RevertTemplateResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Template> template) {
+            Optional<? extends Template> template) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Template> template() {
-        return (Optional<com.clerk.backend_api.models.components.Template>) template;
+    public Optional<Template> template() {
+        return (Optional<Template>) template;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public RevertTemplateResponse withRawResponse(HttpResponse<InputStream> rawRespo
     /**
      * Success
      */
-    public RevertTemplateResponse withTemplate(com.clerk.backend_api.models.components.Template template) {
+    public RevertTemplateResponse withTemplate(Template template) {
         Utils.checkNotNull(template, "template");
         this.template = Optional.ofNullable(template);
         return this;
@@ -137,7 +141,7 @@ public RevertTemplateResponse withTemplate(com.clerk.backend_api.models.componen
     /**
      * Success
      */
-    public RevertTemplateResponse withTemplate(Optional<? extends com.clerk.backend_api.models.components.Template> template) {
+    public RevertTemplateResponse withTemplate(Optional<? extends Template> template) {
         Utils.checkNotNull(template, "template");
         this.template = template;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         RevertTemplateResponse other = (RevertTemplateResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.template, other.template);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.template, other.template);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Template> template = Optional.empty();  
+        private Optional<? extends Template> template = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder template(com.clerk.backend_api.models.components.Template template) {
+        public Builder template(Template template) {
             Utils.checkNotNull(template, "template");
             this.template = Optional.ofNullable(template);
             return this;
@@ -230,7 +234,7 @@ public Builder template(com.clerk.backend_api.models.components.Template templat
         /**
          * Success
          */
-        public Builder template(Optional<? extends com.clerk.backend_api.models.components.Template> template) {
+        public Builder template(Optional<? extends Template> template) {
             Utils.checkNotNull(template, "template");
             this.template = template;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeActorTokenRequest.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeActorTokenRequest.java
index e0fb59b..8df0b3d 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeActorTokenRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeActorTokenRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class RevokeActorTokenRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         RevokeActorTokenRequest other = (RevokeActorTokenRequest) o;
         return 
-            java.util.Objects.deepEquals(this.actorTokenId, other.actorTokenId);
+            Objects.deepEquals(this.actorTokenId, other.actorTokenId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             actorTokenId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeActorTokenRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeActorTokenRequestBuilder.java
index 39fa1cd..5e8590b 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeActorTokenRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeActorTokenRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class RevokeActorTokenRequestBuilder {
 
@@ -26,7 +16,7 @@ public RevokeActorTokenRequestBuilder(SDKMethodInterfaces.MethodCallRevokeActorT
         this.sdk = sdk;
     }
 
-    public RevokeActorTokenRequestBuilder actorTokenId(String actorTokenId) {
+    public RevokeActorTokenRequestBuilder actorTokenId(java.lang.String actorTokenId) {
         Utils.checkNotNull(actorTokenId, "actorTokenId");
         this.actorTokenId = actorTokenId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeActorTokenResponse.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeActorTokenResponse.java
index f943f3c..f61f79d 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeActorTokenResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeActorTokenResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.ActorToken;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class RevokeActorTokenResponse implements com.clerk.backend_api.utils.Response {
+
+public class RevokeActorTokenResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class RevokeActorTokenResponse implements com.clerk.backend_api.utils.Res
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.ActorToken> actorToken;
+    private Optional<? extends ActorToken> actorToken;
 
     @JsonCreator
     public RevokeActorTokenResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.ActorToken> actorToken) {
+            Optional<? extends ActorToken> actorToken) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.ActorToken> actorToken() {
-        return (Optional<com.clerk.backend_api.models.components.ActorToken>) actorToken;
+    public Optional<ActorToken> actorToken() {
+        return (Optional<ActorToken>) actorToken;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public RevokeActorTokenResponse withRawResponse(HttpResponse<InputStream> rawRes
     /**
      * Success
      */
-    public RevokeActorTokenResponse withActorToken(com.clerk.backend_api.models.components.ActorToken actorToken) {
+    public RevokeActorTokenResponse withActorToken(ActorToken actorToken) {
         Utils.checkNotNull(actorToken, "actorToken");
         this.actorToken = Optional.ofNullable(actorToken);
         return this;
@@ -137,7 +141,7 @@ public RevokeActorTokenResponse withActorToken(com.clerk.backend_api.models.comp
     /**
      * Success
      */
-    public RevokeActorTokenResponse withActorToken(Optional<? extends com.clerk.backend_api.models.components.ActorToken> actorToken) {
+    public RevokeActorTokenResponse withActorToken(Optional<? extends ActorToken> actorToken) {
         Utils.checkNotNull(actorToken, "actorToken");
         this.actorToken = actorToken;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         RevokeActorTokenResponse other = (RevokeActorTokenResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.actorToken, other.actorToken);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.actorToken, other.actorToken);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.ActorToken> actorToken = Optional.empty();  
+        private Optional<? extends ActorToken> actorToken = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder actorToken(com.clerk.backend_api.models.components.ActorToken actorToken) {
+        public Builder actorToken(ActorToken actorToken) {
             Utils.checkNotNull(actorToken, "actorToken");
             this.actorToken = Optional.ofNullable(actorToken);
             return this;
@@ -230,7 +234,7 @@ public Builder actorToken(com.clerk.backend_api.models.components.ActorToken act
         /**
          * Success
          */
-        public Builder actorToken(Optional<? extends com.clerk.backend_api.models.components.ActorToken> actorToken) {
+        public Builder actorToken(Optional<? extends ActorToken> actorToken) {
             Utils.checkNotNull(actorToken, "actorToken");
             this.actorToken = actorToken;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeInvitationRequest.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeInvitationRequest.java
index 5b7fb52..1090113 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeInvitationRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeInvitationRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class RevokeInvitationRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         RevokeInvitationRequest other = (RevokeInvitationRequest) o;
         return 
-            java.util.Objects.deepEquals(this.invitationId, other.invitationId);
+            Objects.deepEquals(this.invitationId, other.invitationId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             invitationId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeInvitationRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeInvitationRequestBuilder.java
index adddd92..ae67364 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeInvitationRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeInvitationRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class RevokeInvitationRequestBuilder {
 
@@ -26,7 +16,7 @@ public RevokeInvitationRequestBuilder(SDKMethodInterfaces.MethodCallRevokeInvita
         this.sdk = sdk;
     }
 
-    public RevokeInvitationRequestBuilder invitationId(String invitationId) {
+    public RevokeInvitationRequestBuilder invitationId(java.lang.String invitationId) {
         Utils.checkNotNull(invitationId, "invitationId");
         this.invitationId = invitationId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeInvitationResponse.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeInvitationResponse.java
index cd641d4..aa4f9e8 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeInvitationResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeInvitationResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.InvitationRevoked;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class RevokeInvitationResponse implements com.clerk.backend_api.utils.Response {
+
+public class RevokeInvitationResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class RevokeInvitationResponse implements com.clerk.backend_api.utils.Res
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.InvitationRevoked> invitationRevoked;
+    private Optional<? extends InvitationRevoked> invitationRevoked;
 
     @JsonCreator
     public RevokeInvitationResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.InvitationRevoked> invitationRevoked) {
+            Optional<? extends InvitationRevoked> invitationRevoked) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.InvitationRevoked> invitationRevoked() {
-        return (Optional<com.clerk.backend_api.models.components.InvitationRevoked>) invitationRevoked;
+    public Optional<InvitationRevoked> invitationRevoked() {
+        return (Optional<InvitationRevoked>) invitationRevoked;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public RevokeInvitationResponse withRawResponse(HttpResponse<InputStream> rawRes
     /**
      * Success
      */
-    public RevokeInvitationResponse withInvitationRevoked(com.clerk.backend_api.models.components.InvitationRevoked invitationRevoked) {
+    public RevokeInvitationResponse withInvitationRevoked(InvitationRevoked invitationRevoked) {
         Utils.checkNotNull(invitationRevoked, "invitationRevoked");
         this.invitationRevoked = Optional.ofNullable(invitationRevoked);
         return this;
@@ -137,7 +141,7 @@ public RevokeInvitationResponse withInvitationRevoked(com.clerk.backend_api.mode
     /**
      * Success
      */
-    public RevokeInvitationResponse withInvitationRevoked(Optional<? extends com.clerk.backend_api.models.components.InvitationRevoked> invitationRevoked) {
+    public RevokeInvitationResponse withInvitationRevoked(Optional<? extends InvitationRevoked> invitationRevoked) {
         Utils.checkNotNull(invitationRevoked, "invitationRevoked");
         this.invitationRevoked = invitationRevoked;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         RevokeInvitationResponse other = (RevokeInvitationResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.invitationRevoked, other.invitationRevoked);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.invitationRevoked, other.invitationRevoked);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.InvitationRevoked> invitationRevoked = Optional.empty();  
+        private Optional<? extends InvitationRevoked> invitationRevoked = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder invitationRevoked(com.clerk.backend_api.models.components.InvitationRevoked invitationRevoked) {
+        public Builder invitationRevoked(InvitationRevoked invitationRevoked) {
             Utils.checkNotNull(invitationRevoked, "invitationRevoked");
             this.invitationRevoked = Optional.ofNullable(invitationRevoked);
             return this;
@@ -230,7 +234,7 @@ public Builder invitationRevoked(com.clerk.backend_api.models.components.Invitat
         /**
          * Success
          */
-        public Builder invitationRevoked(Optional<? extends com.clerk.backend_api.models.components.InvitationRevoked> invitationRevoked) {
+        public Builder invitationRevoked(Optional<? extends InvitationRevoked> invitationRevoked) {
             Utils.checkNotNull(invitationRevoked, "invitationRevoked");
             this.invitationRevoked = invitationRevoked;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationRequest.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationRequest.java
index 56adbeb..ec3e8b6 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class RevokeOrganizationInvitationRequest {
 
@@ -104,14 +103,14 @@ public boolean equals(java.lang.Object o) {
         }
         RevokeOrganizationInvitationRequest other = (RevokeOrganizationInvitationRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.invitationId, other.invitationId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.invitationId, other.invitationId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId,
             invitationId,
             requestBody);
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationRequestBody.java
index 1cdb8d6..cdffab7 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationRequestBody.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class RevokeOrganizationInvitationRequestBody {
 
@@ -64,12 +63,12 @@ public boolean equals(java.lang.Object o) {
         }
         RevokeOrganizationInvitationRequestBody other = (RevokeOrganizationInvitationRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.requestingUserId, other.requestingUserId);
+            Objects.deepEquals(this.requestingUserId, other.requestingUserId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             requestingUserId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationRequestBuilder.java
index 0393d25..c7a62bb 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class RevokeOrganizationInvitationRequestBuilder {
 
@@ -28,19 +18,19 @@ public RevokeOrganizationInvitationRequestBuilder(SDKMethodInterfaces.MethodCall
         this.sdk = sdk;
     }
 
-    public RevokeOrganizationInvitationRequestBuilder organizationId(String organizationId) {
+    public RevokeOrganizationInvitationRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
     }
 
-    public RevokeOrganizationInvitationRequestBuilder invitationId(String invitationId) {
+    public RevokeOrganizationInvitationRequestBuilder invitationId(java.lang.String invitationId) {
         Utils.checkNotNull(invitationId, "invitationId");
         this.invitationId = invitationId;
         return this;
     }
 
-    public RevokeOrganizationInvitationRequestBuilder requestBody(RevokeOrganizationInvitationRequestBody requestBody) {
+    public RevokeOrganizationInvitationRequestBuilder requestBody(com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationResponse.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationResponse.java
index 7edac2a..f469c09 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeOrganizationInvitationResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OrganizationInvitation;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class RevokeOrganizationInvitationResponse implements com.clerk.backend_api.utils.Response {
+
+public class RevokeOrganizationInvitationResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class RevokeOrganizationInvitationResponse implements com.clerk.backend_a
     /**
      * An organization invitation
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation;
+    private Optional<? extends OrganizationInvitation> organizationInvitation;
 
     @JsonCreator
     public RevokeOrganizationInvitationResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation) {
+            Optional<? extends OrganizationInvitation> organizationInvitation) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation() {
-        return (Optional<com.clerk.backend_api.models.components.OrganizationInvitation>) organizationInvitation;
+    public Optional<OrganizationInvitation> organizationInvitation() {
+        return (Optional<OrganizationInvitation>) organizationInvitation;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public RevokeOrganizationInvitationResponse withRawResponse(HttpResponse<InputSt
     /**
      * An organization invitation
      */
-    public RevokeOrganizationInvitationResponse withOrganizationInvitation(com.clerk.backend_api.models.components.OrganizationInvitation organizationInvitation) {
+    public RevokeOrganizationInvitationResponse withOrganizationInvitation(OrganizationInvitation organizationInvitation) {
         Utils.checkNotNull(organizationInvitation, "organizationInvitation");
         this.organizationInvitation = Optional.ofNullable(organizationInvitation);
         return this;
@@ -137,7 +141,7 @@ public RevokeOrganizationInvitationResponse withOrganizationInvitation(com.clerk
     /**
      * An organization invitation
      */
-    public RevokeOrganizationInvitationResponse withOrganizationInvitation(Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation) {
+    public RevokeOrganizationInvitationResponse withOrganizationInvitation(Optional<? extends OrganizationInvitation> organizationInvitation) {
         Utils.checkNotNull(organizationInvitation, "organizationInvitation");
         this.organizationInvitation = organizationInvitation;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         RevokeOrganizationInvitationResponse other = (RevokeOrganizationInvitationResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizationInvitation, other.organizationInvitation);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizationInvitation, other.organizationInvitation);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation = Optional.empty();  
+        private Optional<? extends OrganizationInvitation> organizationInvitation = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * An organization invitation
          */
-        public Builder organizationInvitation(com.clerk.backend_api.models.components.OrganizationInvitation organizationInvitation) {
+        public Builder organizationInvitation(OrganizationInvitation organizationInvitation) {
             Utils.checkNotNull(organizationInvitation, "organizationInvitation");
             this.organizationInvitation = Optional.ofNullable(organizationInvitation);
             return this;
@@ -230,7 +234,7 @@ public Builder organizationInvitation(com.clerk.backend_api.models.components.Or
         /**
          * An organization invitation
          */
-        public Builder organizationInvitation(Optional<? extends com.clerk.backend_api.models.components.OrganizationInvitation> organizationInvitation) {
+        public Builder organizationInvitation(Optional<? extends OrganizationInvitation> organizationInvitation) {
             Utils.checkNotNull(organizationInvitation, "organizationInvitation");
             this.organizationInvitation = organizationInvitation;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeSessionRequest.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeSessionRequest.java
index 099055e..7a00c04 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeSessionRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeSessionRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class RevokeSessionRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         RevokeSessionRequest other = (RevokeSessionRequest) o;
         return 
-            java.util.Objects.deepEquals(this.sessionId, other.sessionId);
+            Objects.deepEquals(this.sessionId, other.sessionId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             sessionId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeSessionRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeSessionRequestBuilder.java
index 75b11b1..8b01394 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeSessionRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeSessionRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class RevokeSessionRequestBuilder {
 
@@ -26,7 +16,7 @@ public RevokeSessionRequestBuilder(SDKMethodInterfaces.MethodCallRevokeSession s
         this.sdk = sdk;
     }
 
-    public RevokeSessionRequestBuilder sessionId(String sessionId) {
+    public RevokeSessionRequestBuilder sessionId(java.lang.String sessionId) {
         Utils.checkNotNull(sessionId, "sessionId");
         this.sessionId = sessionId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeSessionResponse.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeSessionResponse.java
index 4d89e6a..447462d 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeSessionResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeSessionResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Session;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class RevokeSessionResponse implements com.clerk.backend_api.utils.Response {
+
+public class RevokeSessionResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class RevokeSessionResponse implements com.clerk.backend_api.utils.Respon
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Session> session;
+    private Optional<? extends Session> session;
 
     @JsonCreator
     public RevokeSessionResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Session> session) {
+            Optional<? extends Session> session) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Session> session() {
-        return (Optional<com.clerk.backend_api.models.components.Session>) session;
+    public Optional<Session> session() {
+        return (Optional<Session>) session;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public RevokeSessionResponse withRawResponse(HttpResponse<InputStream> rawRespon
     /**
      * Success
      */
-    public RevokeSessionResponse withSession(com.clerk.backend_api.models.components.Session session) {
+    public RevokeSessionResponse withSession(Session session) {
         Utils.checkNotNull(session, "session");
         this.session = Optional.ofNullable(session);
         return this;
@@ -137,7 +141,7 @@ public RevokeSessionResponse withSession(com.clerk.backend_api.models.components
     /**
      * Success
      */
-    public RevokeSessionResponse withSession(Optional<? extends com.clerk.backend_api.models.components.Session> session) {
+    public RevokeSessionResponse withSession(Optional<? extends Session> session) {
         Utils.checkNotNull(session, "session");
         this.session = session;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         RevokeSessionResponse other = (RevokeSessionResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.session, other.session);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.session, other.session);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Session> session = Optional.empty();  
+        private Optional<? extends Session> session = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder session(com.clerk.backend_api.models.components.Session session) {
+        public Builder session(Session session) {
             Utils.checkNotNull(session, "session");
             this.session = Optional.ofNullable(session);
             return this;
@@ -230,7 +234,7 @@ public Builder session(com.clerk.backend_api.models.components.Session session)
         /**
          * Success
          */
-        public Builder session(Optional<? extends com.clerk.backend_api.models.components.Session> session) {
+        public Builder session(Optional<? extends Session> session) {
             Utils.checkNotNull(session, "session");
             this.session = session;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeSignInTokenRequest.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeSignInTokenRequest.java
index ddbf0fd..5d595cc 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeSignInTokenRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeSignInTokenRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class RevokeSignInTokenRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         RevokeSignInTokenRequest other = (RevokeSignInTokenRequest) o;
         return 
-            java.util.Objects.deepEquals(this.signInTokenId, other.signInTokenId);
+            Objects.deepEquals(this.signInTokenId, other.signInTokenId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             signInTokenId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeSignInTokenRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeSignInTokenRequestBuilder.java
index ab568fb..0529848 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeSignInTokenRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeSignInTokenRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class RevokeSignInTokenRequestBuilder {
 
@@ -26,7 +16,7 @@ public RevokeSignInTokenRequestBuilder(SDKMethodInterfaces.MethodCallRevokeSignI
         this.sdk = sdk;
     }
 
-    public RevokeSignInTokenRequestBuilder signInTokenId(String signInTokenId) {
+    public RevokeSignInTokenRequestBuilder signInTokenId(java.lang.String signInTokenId) {
         Utils.checkNotNull(signInTokenId, "signInTokenId");
         this.signInTokenId = signInTokenId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RevokeSignInTokenResponse.java b/src/main/java/com/clerk/backend_api/models/operations/RevokeSignInTokenResponse.java
index af853d0..0fbf045 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RevokeSignInTokenResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RevokeSignInTokenResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.SignInToken;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class RevokeSignInTokenResponse implements com.clerk.backend_api.utils.Response {
+
+public class RevokeSignInTokenResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class RevokeSignInTokenResponse implements com.clerk.backend_api.utils.Re
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.SignInToken> signInToken;
+    private Optional<? extends SignInToken> signInToken;
 
     @JsonCreator
     public RevokeSignInTokenResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.SignInToken> signInToken) {
+            Optional<? extends SignInToken> signInToken) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.SignInToken> signInToken() {
-        return (Optional<com.clerk.backend_api.models.components.SignInToken>) signInToken;
+    public Optional<SignInToken> signInToken() {
+        return (Optional<SignInToken>) signInToken;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public RevokeSignInTokenResponse withRawResponse(HttpResponse<InputStream> rawRe
     /**
      * Success
      */
-    public RevokeSignInTokenResponse withSignInToken(com.clerk.backend_api.models.components.SignInToken signInToken) {
+    public RevokeSignInTokenResponse withSignInToken(SignInToken signInToken) {
         Utils.checkNotNull(signInToken, "signInToken");
         this.signInToken = Optional.ofNullable(signInToken);
         return this;
@@ -137,7 +141,7 @@ public RevokeSignInTokenResponse withSignInToken(com.clerk.backend_api.models.co
     /**
      * Success
      */
-    public RevokeSignInTokenResponse withSignInToken(Optional<? extends com.clerk.backend_api.models.components.SignInToken> signInToken) {
+    public RevokeSignInTokenResponse withSignInToken(Optional<? extends SignInToken> signInToken) {
         Utils.checkNotNull(signInToken, "signInToken");
         this.signInToken = signInToken;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         RevokeSignInTokenResponse other = (RevokeSignInTokenResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.signInToken, other.signInToken);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.signInToken, other.signInToken);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.SignInToken> signInToken = Optional.empty();  
+        private Optional<? extends SignInToken> signInToken = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder signInToken(com.clerk.backend_api.models.components.SignInToken signInToken) {
+        public Builder signInToken(SignInToken signInToken) {
             Utils.checkNotNull(signInToken, "signInToken");
             this.signInToken = Optional.ofNullable(signInToken);
             return this;
@@ -230,7 +234,7 @@ public Builder signInToken(com.clerk.backend_api.models.components.SignInToken s
         /**
          * Success
          */
-        public Builder signInToken(Optional<? extends com.clerk.backend_api.models.components.SignInToken> signInToken) {
+        public Builder signInToken(Optional<? extends SignInToken> signInToken) {
             Utils.checkNotNull(signInToken, "signInToken");
             this.signInToken = signInToken;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RotateOAuthApplicationSecretRequest.java b/src/main/java/com/clerk/backend_api/models/operations/RotateOAuthApplicationSecretRequest.java
index a8adff4..28bca85 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RotateOAuthApplicationSecretRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RotateOAuthApplicationSecretRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class RotateOAuthApplicationSecretRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         RotateOAuthApplicationSecretRequest other = (RotateOAuthApplicationSecretRequest) o;
         return 
-            java.util.Objects.deepEquals(this.oauthApplicationId, other.oauthApplicationId);
+            Objects.deepEquals(this.oauthApplicationId, other.oauthApplicationId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             oauthApplicationId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RotateOAuthApplicationSecretRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/RotateOAuthApplicationSecretRequestBuilder.java
index 64724cd..26768ae 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RotateOAuthApplicationSecretRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RotateOAuthApplicationSecretRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class RotateOAuthApplicationSecretRequestBuilder {
 
@@ -26,7 +16,7 @@ public RotateOAuthApplicationSecretRequestBuilder(SDKMethodInterfaces.MethodCall
         this.sdk = sdk;
     }
 
-    public RotateOAuthApplicationSecretRequestBuilder oauthApplicationId(String oauthApplicationId) {
+    public RotateOAuthApplicationSecretRequestBuilder oauthApplicationId(java.lang.String oauthApplicationId) {
         Utils.checkNotNull(oauthApplicationId, "oauthApplicationId");
         this.oauthApplicationId = oauthApplicationId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/RotateOAuthApplicationSecretResponse.java b/src/main/java/com/clerk/backend_api/models/operations/RotateOAuthApplicationSecretResponse.java
index 562fbb4..afee4ba 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/RotateOAuthApplicationSecretResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/RotateOAuthApplicationSecretResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OAuthApplicationWithSecret;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class RotateOAuthApplicationSecretResponse implements com.clerk.backend_api.utils.Response {
+
+public class RotateOAuthApplicationSecretResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class RotateOAuthApplicationSecretResponse implements com.clerk.backend_a
     /**
      * An OAuth application with client secret
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OAuthApplicationWithSecret> oAuthApplicationWithSecret;
+    private Optional<? extends OAuthApplicationWithSecret> oAuthApplicationWithSecret;
 
     @JsonCreator
     public RotateOAuthApplicationSecretResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OAuthApplicationWithSecret> oAuthApplicationWithSecret) {
+            Optional<? extends OAuthApplicationWithSecret> oAuthApplicationWithSecret) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OAuthApplicationWithSecret> oAuthApplicationWithSecret() {
-        return (Optional<com.clerk.backend_api.models.components.OAuthApplicationWithSecret>) oAuthApplicationWithSecret;
+    public Optional<OAuthApplicationWithSecret> oAuthApplicationWithSecret() {
+        return (Optional<OAuthApplicationWithSecret>) oAuthApplicationWithSecret;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public RotateOAuthApplicationSecretResponse withRawResponse(HttpResponse<InputSt
     /**
      * An OAuth application with client secret
      */
-    public RotateOAuthApplicationSecretResponse withOAuthApplicationWithSecret(com.clerk.backend_api.models.components.OAuthApplicationWithSecret oAuthApplicationWithSecret) {
+    public RotateOAuthApplicationSecretResponse withOAuthApplicationWithSecret(OAuthApplicationWithSecret oAuthApplicationWithSecret) {
         Utils.checkNotNull(oAuthApplicationWithSecret, "oAuthApplicationWithSecret");
         this.oAuthApplicationWithSecret = Optional.ofNullable(oAuthApplicationWithSecret);
         return this;
@@ -137,7 +141,7 @@ public RotateOAuthApplicationSecretResponse withOAuthApplicationWithSecret(com.c
     /**
      * An OAuth application with client secret
      */
-    public RotateOAuthApplicationSecretResponse withOAuthApplicationWithSecret(Optional<? extends com.clerk.backend_api.models.components.OAuthApplicationWithSecret> oAuthApplicationWithSecret) {
+    public RotateOAuthApplicationSecretResponse withOAuthApplicationWithSecret(Optional<? extends OAuthApplicationWithSecret> oAuthApplicationWithSecret) {
         Utils.checkNotNull(oAuthApplicationWithSecret, "oAuthApplicationWithSecret");
         this.oAuthApplicationWithSecret = oAuthApplicationWithSecret;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         RotateOAuthApplicationSecretResponse other = (RotateOAuthApplicationSecretResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.oAuthApplicationWithSecret, other.oAuthApplicationWithSecret);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.oAuthApplicationWithSecret, other.oAuthApplicationWithSecret);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OAuthApplicationWithSecret> oAuthApplicationWithSecret = Optional.empty();  
+        private Optional<? extends OAuthApplicationWithSecret> oAuthApplicationWithSecret = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * An OAuth application with client secret
          */
-        public Builder oAuthApplicationWithSecret(com.clerk.backend_api.models.components.OAuthApplicationWithSecret oAuthApplicationWithSecret) {
+        public Builder oAuthApplicationWithSecret(OAuthApplicationWithSecret oAuthApplicationWithSecret) {
             Utils.checkNotNull(oAuthApplicationWithSecret, "oAuthApplicationWithSecret");
             this.oAuthApplicationWithSecret = Optional.ofNullable(oAuthApplicationWithSecret);
             return this;
@@ -230,7 +234,7 @@ public Builder oAuthApplicationWithSecret(com.clerk.backend_api.models.component
         /**
          * An OAuth application with client secret
          */
-        public Builder oAuthApplicationWithSecret(Optional<? extends com.clerk.backend_api.models.components.OAuthApplicationWithSecret> oAuthApplicationWithSecret) {
+        public Builder oAuthApplicationWithSecret(Optional<? extends OAuthApplicationWithSecret> oAuthApplicationWithSecret) {
             Utils.checkNotNull(oAuthApplicationWithSecret, "oAuthApplicationWithSecret");
             this.oAuthApplicationWithSecret = oAuthApplicationWithSecret;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/SDKMethodInterfaces.java b/src/main/java/com/clerk/backend_api/models/operations/SDKMethodInterfaces.java
index 518a6af..3dd6c50 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/SDKMethodInterfaces.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/SDKMethodInterfaces.java
@@ -4,20 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.Long;
+import java.lang.String;
+import java.util.List;
 import java.util.Optional;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class SDKMethodInterfaces {
 
+
     public interface MethodCallGetPublicInterstitial {
         com.clerk.backend_api.models.operations.GetPublicInterstitialResponse getPublicInterstitial(
-            Optional<? extends String> frontendApi,
-            Optional<? extends String> publishableKey) throws Exception;
+            Optional<String> frontendApi,
+            Optional<String> publishableKey) throws Exception;
     }
 
 
@@ -28,14 +26,14 @@ public interface MethodCallGetJWKS {
 
     public interface MethodCallGetClientList {
         com.clerk.backend_api.models.operations.GetClientListResponse list(
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) throws Exception;
+            Optional<Long> limit,
+            Optional<Long> offset) throws Exception;
     }
 
 
     public interface MethodCallVerifyClient {
         com.clerk.backend_api.models.operations.VerifyClientResponse verify(
-            Optional<? extends com.clerk.backend_api.models.operations.VerifyClientRequestBody> request) throws Exception;
+            Optional<? extends VerifyClientRequestBody> request) throws Exception;
     }
 
 
@@ -47,7 +45,7 @@ com.clerk.backend_api.models.operations.GetClientResponse get(
 
     public interface MethodCallCreateEmailAddress {
         com.clerk.backend_api.models.operations.CreateEmailAddressResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateEmailAddressRequestBody> request) throws Exception;
+            Optional<? extends CreateEmailAddressRequestBody> request) throws Exception;
     }
 
 
@@ -66,13 +64,13 @@ com.clerk.backend_api.models.operations.DeleteEmailAddressResponse delete(
     public interface MethodCallUpdateEmailAddress {
         com.clerk.backend_api.models.operations.UpdateEmailAddressResponse update(
             String emailAddressId,
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateEmailAddressRequestBody> requestBody) throws Exception;
+            Optional<? extends UpdateEmailAddressRequestBody> requestBody) throws Exception;
     }
 
 
     public interface MethodCallCreatePhoneNumber {
         com.clerk.backend_api.models.operations.CreatePhoneNumberResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreatePhoneNumberRequestBody> request) throws Exception;
+            Optional<? extends CreatePhoneNumberRequestBody> request) throws Exception;
     }
 
 
@@ -91,13 +89,13 @@ com.clerk.backend_api.models.operations.DeletePhoneNumberResponse delete(
     public interface MethodCallUpdatePhoneNumber {
         com.clerk.backend_api.models.operations.UpdatePhoneNumberResponse update(
             String phoneNumberId,
-            Optional<? extends com.clerk.backend_api.models.operations.UpdatePhoneNumberRequestBody> requestBody) throws Exception;
+            Optional<? extends UpdatePhoneNumberRequestBody> requestBody) throws Exception;
     }
 
 
     public interface MethodCallGetSessionList {
         com.clerk.backend_api.models.operations.GetSessionListResponse list(
-            com.clerk.backend_api.models.operations.GetSessionListRequest request) throws Exception;
+            GetSessionListRequest request) throws Exception;
     }
 
 
@@ -116,7 +114,7 @@ com.clerk.backend_api.models.operations.RevokeSessionResponse revoke(
     public interface MethodCallVerifySession {
         com.clerk.backend_api.models.operations.VerifySessionResponse verify(
             String sessionId,
-            Optional<? extends com.clerk.backend_api.models.operations.VerifySessionRequestBody> requestBody) throws Exception;
+            Optional<? extends VerifySessionRequestBody> requestBody) throws Exception;
     }
 
 
@@ -129,28 +127,28 @@ com.clerk.backend_api.models.operations.CreateSessionTokenFromTemplateResponse c
 
     public interface MethodCallGetTemplateList {
         com.clerk.backend_api.models.operations.GetTemplateListResponse list(
-            com.clerk.backend_api.models.operations.TemplateType templateType) throws Exception;
+            TemplateType templateType) throws Exception;
     }
 
 
     public interface MethodCallGetTemplate {
         com.clerk.backend_api.models.operations.GetTemplateResponse get(
-            com.clerk.backend_api.models.operations.PathParamTemplateType templateType,
+            PathParamTemplateType templateType,
             String slug) throws Exception;
     }
 
 
     public interface MethodCallUpsertTemplate {
         com.clerk.backend_api.models.operations.UpsertTemplateResponse upsert(
-            com.clerk.backend_api.models.operations.UpsertTemplatePathParamTemplateType templateType,
+            UpsertTemplatePathParamTemplateType templateType,
             String slug,
-            Optional<? extends com.clerk.backend_api.models.operations.UpsertTemplateRequestBody> requestBody) throws Exception;
+            Optional<? extends UpsertTemplateRequestBody> requestBody) throws Exception;
     }
 
 
     public interface MethodCallRevertTemplate {
         com.clerk.backend_api.models.operations.RevertTemplateResponse revert(
-            com.clerk.backend_api.models.operations.RevertTemplatePathParamTemplateType templateType,
+            RevertTemplatePathParamTemplateType templateType,
             String slug) throws Exception;
     }
 
@@ -159,33 +157,33 @@ public interface MethodCallPreviewTemplate {
         com.clerk.backend_api.models.operations.PreviewTemplateResponse preview(
             String templateType,
             String slug,
-            Optional<? extends com.clerk.backend_api.models.operations.PreviewTemplateRequestBody> requestBody) throws Exception;
+            Optional<? extends PreviewTemplateRequestBody> requestBody) throws Exception;
     }
 
 
     public interface MethodCallToggleTemplateDelivery {
         com.clerk.backend_api.models.operations.ToggleTemplateDeliveryResponse toggleDelivery(
-            com.clerk.backend_api.models.operations.ToggleTemplateDeliveryPathParamTemplateType templateType,
+            ToggleTemplateDeliveryPathParamTemplateType templateType,
             String slug,
-            Optional<? extends com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequestBody> requestBody) throws Exception;
+            Optional<? extends ToggleTemplateDeliveryRequestBody> requestBody) throws Exception;
     }
 
 
     public interface MethodCallGetUserList {
         com.clerk.backend_api.models.operations.GetUserListResponse list(
-            com.clerk.backend_api.models.operations.GetUserListRequest request) throws Exception;
+            GetUserListRequest request) throws Exception;
     }
 
 
     public interface MethodCallCreateUser {
         com.clerk.backend_api.models.operations.CreateUserResponse create(
-            com.clerk.backend_api.models.operations.CreateUserRequestBody request) throws Exception;
+            CreateUserRequestBody request) throws Exception;
     }
 
 
     public interface MethodCallGetUsersCount {
         com.clerk.backend_api.models.operations.GetUsersCountResponse count(
-            com.clerk.backend_api.models.operations.GetUsersCountRequest request) throws Exception;
+            GetUsersCountRequest request) throws Exception;
     }
 
 
@@ -198,7 +196,7 @@ com.clerk.backend_api.models.operations.GetUserResponse get(
     public interface MethodCallUpdateUser {
         com.clerk.backend_api.models.operations.UpdateUserResponse update(
             String userId,
-            com.clerk.backend_api.models.operations.UpdateUserRequestBody requestBody) throws Exception;
+            UpdateUserRequestBody requestBody) throws Exception;
     }
 
 
@@ -235,7 +233,7 @@ com.clerk.backend_api.models.operations.UnlockUserResponse unlock(
     public interface MethodCallSetUserProfileImage {
         com.clerk.backend_api.models.operations.SetUserProfileImageResponse setProfileImage(
             String userId,
-            com.clerk.backend_api.models.operations.SetUserProfileImageRequestBody requestBody) throws Exception;
+            SetUserProfileImageRequestBody requestBody) throws Exception;
     }
 
 
@@ -248,7 +246,7 @@ com.clerk.backend_api.models.operations.DeleteUserProfileImageResponse deletePro
     public interface MethodCallUpdateUserMetadata {
         com.clerk.backend_api.models.operations.UpdateUserMetadataResponse updateMetadata(
             String userId,
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateUserMetadataRequestBody> requestBody) throws Exception;
+            Optional<? extends UpdateUserMetadataRequestBody> requestBody) throws Exception;
     }
 
 
@@ -262,22 +260,22 @@ com.clerk.backend_api.models.operations.GetOAuthAccessTokenResponse getOAuthAcce
     public interface MethodCallUsersGetOrganizationMemberships {
         com.clerk.backend_api.models.operations.UsersGetOrganizationMembershipsResponse getOrganizationMemberships(
             String userId,
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) throws Exception;
+            Optional<Long> limit,
+            Optional<Long> offset) throws Exception;
     }
 
 
     public interface MethodCallVerifyPassword {
         com.clerk.backend_api.models.operations.VerifyPasswordResponse verifyPassword(
             String userId,
-            Optional<? extends com.clerk.backend_api.models.operations.VerifyPasswordRequestBody> requestBody) throws Exception;
+            Optional<? extends VerifyPasswordRequestBody> requestBody) throws Exception;
     }
 
 
     public interface MethodCallVerifyTOTP {
         com.clerk.backend_api.models.operations.VerifyTOTPResponse verifyTOTP(
             String userId,
-            Optional<? extends com.clerk.backend_api.models.operations.VerifyTOTPRequestBody> requestBody) throws Exception;
+            Optional<? extends VerifyTOTPRequestBody> requestBody) throws Exception;
     }
 
 
@@ -289,15 +287,15 @@ com.clerk.backend_api.models.operations.DisableMFAResponse disableMFA(
 
     public interface MethodCallCreateInvitation {
         com.clerk.backend_api.models.operations.CreateInvitationResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateInvitationRequestBody> request) throws Exception;
+            Optional<? extends CreateInvitationRequestBody> request) throws Exception;
     }
 
 
     public interface MethodCallListInvitations {
         com.clerk.backend_api.models.operations.ListInvitationsResponse list(
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset,
-            Optional<? extends com.clerk.backend_api.models.operations.QueryParamStatus> status) throws Exception;
+            Optional<Long> limit,
+            Optional<Long> offset,
+            Optional<? extends QueryParamStatus> status) throws Exception;
     }
 
 
@@ -314,7 +312,7 @@ public interface MethodCallListAllowlistIdentifiers {
 
     public interface MethodCallCreateAllowlistIdentifier {
         com.clerk.backend_api.models.operations.CreateAllowlistIdentifierResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateAllowlistIdentifierRequestBody> request) throws Exception;
+            Optional<? extends CreateAllowlistIdentifierRequestBody> request) throws Exception;
     }
 
 
@@ -331,7 +329,7 @@ public interface MethodCallListBlocklistIdentifiers {
 
     public interface MethodCallCreateBlocklistIdentifier {
         com.clerk.backend_api.models.operations.CreateBlocklistIdentifierResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateBlocklistIdentifierRequestBody> request) throws Exception;
+            Optional<? extends CreateBlocklistIdentifierRequestBody> request) throws Exception;
     }
 
 
@@ -343,43 +341,43 @@ com.clerk.backend_api.models.operations.DeleteBlocklistIdentifierResponse delete
 
     public interface MethodCallUpdateInstanceAuthConfig {
         com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigResponse updateAuthConfig(
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigRequestBody> request) throws Exception;
+            Optional<? extends UpdateInstanceAuthConfigRequestBody> request) throws Exception;
     }
 
 
     public interface MethodCallUpdateProductionInstanceDomain {
         com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainResponse updateProductionDomain(
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRequestBody> request) throws Exception;
+            Optional<? extends UpdateProductionInstanceDomainRequestBody> request) throws Exception;
     }
 
 
     public interface MethodCallUpdateInstance {
         com.clerk.backend_api.models.operations.UpdateInstanceResponse update(
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceRequestBody> request) throws Exception;
+            Optional<? extends UpdateInstanceRequestBody> request) throws Exception;
     }
 
 
     public interface MethodCallUpdateInstanceRestrictions {
         com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsResponse updateRestrictions(
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRequestBody> request) throws Exception;
+            Optional<? extends UpdateInstanceRestrictionsRequestBody> request) throws Exception;
     }
 
 
     public interface MethodCallChangeProductionInstanceDomain {
         com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainResponse changeProductionDomain(
-            Optional<? extends com.clerk.backend_api.models.operations.ChangeProductionInstanceDomainRequestBody> request) throws Exception;
+            Optional<? extends ChangeProductionInstanceDomainRequestBody> request) throws Exception;
     }
 
 
     public interface MethodCallUpdateInstanceOrganizationSettings {
         com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsResponse updateOrganizationSettings(
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsRequestBody> request) throws Exception;
+            Optional<? extends UpdateInstanceOrganizationSettingsRequestBody> request) throws Exception;
     }
 
 
     public interface MethodCallCreateActorToken {
         com.clerk.backend_api.models.operations.CreateActorTokenResponse createToken(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateActorTokenRequestBody> request) throws Exception;
+            Optional<? extends CreateActorTokenRequestBody> request) throws Exception;
     }
 
 
@@ -396,7 +394,7 @@ public interface MethodCallListDomains {
 
     public interface MethodCallAddDomain {
         com.clerk.backend_api.models.operations.AddDomainResponse add(
-            Optional<? extends com.clerk.backend_api.models.operations.AddDomainRequestBody> request) throws Exception;
+            Optional<? extends AddDomainRequestBody> request) throws Exception;
     }
 
 
@@ -409,7 +407,7 @@ com.clerk.backend_api.models.operations.DeleteDomainResponse delete(
     public interface MethodCallUpdateDomain {
         com.clerk.backend_api.models.operations.UpdateDomainResponse update(
             String domainId,
-            com.clerk.backend_api.models.operations.UpdateDomainRequestBody requestBody) throws Exception;
+            UpdateDomainRequestBody requestBody) throws Exception;
     }
 
 
@@ -435,7 +433,7 @@ public interface MethodCallListJWTTemplates {
 
     public interface MethodCallCreateJWTTemplate {
         com.clerk.backend_api.models.operations.CreateJWTTemplateResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateJWTTemplateRequestBody> request) throws Exception;
+            Optional<? extends CreateJWTTemplateRequestBody> request) throws Exception;
     }
 
 
@@ -448,7 +446,7 @@ com.clerk.backend_api.models.operations.GetJWTTemplateResponse get(
     public interface MethodCallUpdateJWTTemplate {
         com.clerk.backend_api.models.operations.UpdateJWTTemplateResponse update(
             String templateId,
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateJWTTemplateRequestBody> requestBody) throws Exception;
+            Optional<? extends UpdateJWTTemplateRequestBody> requestBody) throws Exception;
     }
 
 
@@ -460,13 +458,13 @@ com.clerk.backend_api.models.operations.DeleteJWTTemplateResponse delete(
 
     public interface MethodCallListOrganizations {
         com.clerk.backend_api.models.operations.ListOrganizationsResponse list(
-            com.clerk.backend_api.models.operations.ListOrganizationsRequest request) throws Exception;
+            ListOrganizationsRequest request) throws Exception;
     }
 
 
     public interface MethodCallCreateOrganization {
         com.clerk.backend_api.models.operations.CreateOrganizationResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateOrganizationRequestBody> request) throws Exception;
+            Optional<? extends CreateOrganizationRequestBody> request) throws Exception;
     }
 
 
@@ -479,7 +477,7 @@ com.clerk.backend_api.models.operations.GetOrganizationResponse get(
     public interface MethodCallUpdateOrganization {
         com.clerk.backend_api.models.operations.UpdateOrganizationResponse update(
             String organizationId,
-            com.clerk.backend_api.models.operations.UpdateOrganizationRequestBody requestBody) throws Exception;
+            UpdateOrganizationRequestBody requestBody) throws Exception;
     }
 
 
@@ -492,14 +490,14 @@ com.clerk.backend_api.models.operations.DeleteOrganizationResponse delete(
     public interface MethodCallMergeOrganizationMetadata {
         com.clerk.backend_api.models.operations.MergeOrganizationMetadataResponse mergeMetadata(
             String organizationId,
-            com.clerk.backend_api.models.operations.MergeOrganizationMetadataRequestBody requestBody) throws Exception;
+            MergeOrganizationMetadataRequestBody requestBody) throws Exception;
     }
 
 
     public interface MethodCallUploadOrganizationLogo {
         com.clerk.backend_api.models.operations.UploadOrganizationLogoResponse uploadLogo(
             String organizationId,
-            Optional<? extends com.clerk.backend_api.models.operations.UploadOrganizationLogoRequestBody> requestBody) throws Exception;
+            Optional<? extends UploadOrganizationLogoRequestBody> requestBody) throws Exception;
     }
 
 
@@ -512,31 +510,31 @@ com.clerk.backend_api.models.operations.DeleteOrganizationLogoResponse deleteLog
     public interface MethodCallCreateOrganizationInvitation {
         com.clerk.backend_api.models.operations.CreateOrganizationInvitationResponse create(
             String organizationId,
-            com.clerk.backend_api.models.operations.CreateOrganizationInvitationRequestBody requestBody) throws Exception;
+            CreateOrganizationInvitationRequestBody requestBody) throws Exception;
     }
 
 
     public interface MethodCallListOrganizationInvitations {
         com.clerk.backend_api.models.operations.ListOrganizationInvitationsResponse list(
             String organizationId,
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset,
-            Optional<? extends com.clerk.backend_api.models.operations.ListOrganizationInvitationsQueryParamStatus> status) throws Exception;
+            Optional<Long> limit,
+            Optional<Long> offset,
+            Optional<? extends ListOrganizationInvitationsQueryParamStatus> status) throws Exception;
     }
 
 
     public interface MethodCallCreateOrganizationInvitationBulk {
         com.clerk.backend_api.models.operations.CreateOrganizationInvitationBulkResponse createBulk(
             String organizationId,
-            java.util.List<com.clerk.backend_api.models.operations.RequestBody> requestBody) throws Exception;
+            List<RequestBody> requestBody) throws Exception;
     }
 
 
     public interface MethodCallListPendingOrganizationInvitations {
         com.clerk.backend_api.models.operations.ListPendingOrganizationInvitationsResponse listPending(
             String organizationId,
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) throws Exception;
+            Optional<Long> limit,
+            Optional<Long> offset) throws Exception;
     }
 
 
@@ -551,23 +549,23 @@ public interface MethodCallRevokeOrganizationInvitation {
         com.clerk.backend_api.models.operations.RevokeOrganizationInvitationResponse revoke(
             String organizationId,
             String invitationId,
-            com.clerk.backend_api.models.operations.RevokeOrganizationInvitationRequestBody requestBody) throws Exception;
+            RevokeOrganizationInvitationRequestBody requestBody) throws Exception;
     }
 
 
     public interface MethodCallCreateOrganizationMembership {
         com.clerk.backend_api.models.operations.CreateOrganizationMembershipResponse create(
             String organizationId,
-            com.clerk.backend_api.models.operations.CreateOrganizationMembershipRequestBody requestBody) throws Exception;
+            CreateOrganizationMembershipRequestBody requestBody) throws Exception;
     }
 
 
     public interface MethodCallListOrganizationMemberships {
         com.clerk.backend_api.models.operations.ListOrganizationMembershipsResponse list(
             String organizationId,
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset,
-            Optional<? extends String> orderBy) throws Exception;
+            Optional<Long> limit,
+            Optional<Long> offset,
+            Optional<String> orderBy) throws Exception;
     }
 
 
@@ -575,7 +573,7 @@ public interface MethodCallUpdateOrganizationMembership {
         com.clerk.backend_api.models.operations.UpdateOrganizationMembershipResponse update(
             String organizationId,
             String userId,
-            com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRequestBody requestBody) throws Exception;
+            UpdateOrganizationMembershipRequestBody requestBody) throws Exception;
     }
 
 
@@ -590,13 +588,13 @@ public interface MethodCallUpdateOrganizationMembershipMetadata {
         com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataResponse updateMetadata(
             String organizationId,
             String userId,
-            com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataRequestBody requestBody) throws Exception;
+            UpdateOrganizationMembershipMetadataRequestBody requestBody) throws Exception;
     }
 
 
     public interface MethodCallVerifyDomainProxy {
         com.clerk.backend_api.models.operations.VerifyDomainProxyResponse verifyDomain(
-            Optional<? extends com.clerk.backend_api.models.operations.VerifyDomainProxyRequestBody> request) throws Exception;
+            Optional<? extends VerifyDomainProxyRequestBody> request) throws Exception;
     }
 
 
@@ -607,7 +605,7 @@ public interface MethodCallListRedirectURLs {
 
     public interface MethodCallCreateRedirectURL {
         com.clerk.backend_api.models.operations.CreateRedirectURLResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateRedirectURLRequestBody> request) throws Exception;
+            Optional<? extends CreateRedirectURLRequestBody> request) throws Exception;
     }
 
 
@@ -625,7 +623,7 @@ com.clerk.backend_api.models.operations.DeleteRedirectURLResponse delete(
 
     public interface MethodCallCreateSignInToken {
         com.clerk.backend_api.models.operations.CreateSignInTokenResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateSignInTokenRequestBody> request) throws Exception;
+            Optional<? extends CreateSignInTokenRequestBody> request) throws Exception;
     }
 
 
@@ -638,20 +636,20 @@ com.clerk.backend_api.models.operations.RevokeSignInTokenResponse revoke(
     public interface MethodCallUpdateSignUp {
         com.clerk.backend_api.models.operations.UpdateSignUpResponse update(
             String id,
-            Optional<? extends com.clerk.backend_api.models.operations.UpdateSignUpRequestBody> requestBody) throws Exception;
+            Optional<? extends UpdateSignUpRequestBody> requestBody) throws Exception;
     }
 
 
     public interface MethodCallListOAuthApplications {
         com.clerk.backend_api.models.operations.ListOAuthApplicationsResponse list(
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) throws Exception;
+            Optional<Long> limit,
+            Optional<Long> offset) throws Exception;
     }
 
 
     public interface MethodCallCreateOAuthApplication {
         com.clerk.backend_api.models.operations.CreateOAuthApplicationResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateOAuthApplicationRequestBody> request) throws Exception;
+            Optional<? extends CreateOAuthApplicationRequestBody> request) throws Exception;
     }
 
 
@@ -664,7 +662,7 @@ com.clerk.backend_api.models.operations.GetOAuthApplicationResponse get(
     public interface MethodCallUpdateOAuthApplication {
         com.clerk.backend_api.models.operations.UpdateOAuthApplicationResponse updateApplication(
             String oauthApplicationId,
-            com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequestBody requestBody) throws Exception;
+            UpdateOAuthApplicationRequestBody requestBody) throws Exception;
     }
 
 
@@ -682,14 +680,14 @@ com.clerk.backend_api.models.operations.RotateOAuthApplicationSecretResponse rot
 
     public interface MethodCallListSAMLConnections {
         com.clerk.backend_api.models.operations.ListSAMLConnectionsResponse list(
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) throws Exception;
+            Optional<Long> limit,
+            Optional<Long> offset) throws Exception;
     }
 
 
     public interface MethodCallCreateSAMLConnection {
         com.clerk.backend_api.models.operations.CreateSAMLConnectionResponse create(
-            Optional<? extends com.clerk.backend_api.models.operations.CreateSAMLConnectionRequestBody> request) throws Exception;
+            Optional<? extends CreateSAMLConnectionRequestBody> request) throws Exception;
     }
 
 
@@ -702,7 +700,7 @@ com.clerk.backend_api.models.operations.GetSAMLConnectionResponse get(
     public interface MethodCallUpdateSAMLConnection {
         com.clerk.backend_api.models.operations.UpdateSAMLConnectionResponse update(
             String samlConnectionId,
-            com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequestBody requestBody) throws Exception;
+            UpdateSAMLConnectionRequestBody requestBody) throws Exception;
     }
 
 
@@ -716,4 +714,5 @@ public interface MethodCallCreateTestingToken {
         com.clerk.backend_api.models.operations.CreateTestingTokenResponse createDirect() throws Exception;
     }
 
+
 }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageRequest.java b/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageRequest.java
index 6aa7c07..0172cb1 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class SetUserProfileImageRequest {
 
@@ -78,13 +77,13 @@ public boolean equals(java.lang.Object o) {
         }
         SetUserProfileImageRequest other = (SetUserProfileImageRequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageRequestBody.java
index 86b6011..9b84c0e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageRequestBody.java
@@ -4,18 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class SetUserProfileImageRequestBody {
 
     @SpeakeasyMetadata("multipartForm:file")
@@ -64,12 +64,12 @@ public boolean equals(java.lang.Object o) {
         }
         SetUserProfileImageRequestBody other = (SetUserProfileImageRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.file, other.file);
+            Objects.deepEquals(this.file, other.file);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             file);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageRequestBuilder.java
index 348f1e3..4a7618f 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class SetUserProfileImageRequestBuilder {
 
@@ -27,13 +17,13 @@ public SetUserProfileImageRequestBuilder(SDKMethodInterfaces.MethodCallSetUserPr
         this.sdk = sdk;
     }
 
-    public SetUserProfileImageRequestBuilder userId(String userId) {
+    public SetUserProfileImageRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
     }
 
-    public SetUserProfileImageRequestBuilder requestBody(SetUserProfileImageRequestBody requestBody) {
+    public SetUserProfileImageRequestBuilder requestBody(com.clerk.backend_api.models.operations.SetUserProfileImageRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageResponse.java b/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageResponse.java
index a2699ff..7be65b5 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/SetUserProfileImageResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.User;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class SetUserProfileImageResponse implements com.clerk.backend_api.utils.Response {
+
+public class SetUserProfileImageResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class SetUserProfileImageResponse implements com.clerk.backend_api.utils.
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.User> user;
+    private Optional<? extends User> user;
 
     @JsonCreator
     public SetUserProfileImageResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.User> user) {
+            Optional<? extends User> user) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.User> user() {
-        return (Optional<com.clerk.backend_api.models.components.User>) user;
+    public Optional<User> user() {
+        return (Optional<User>) user;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public SetUserProfileImageResponse withRawResponse(HttpResponse<InputStream> raw
     /**
      * Success
      */
-    public SetUserProfileImageResponse withUser(com.clerk.backend_api.models.components.User user) {
+    public SetUserProfileImageResponse withUser(User user) {
         Utils.checkNotNull(user, "user");
         this.user = Optional.ofNullable(user);
         return this;
@@ -137,7 +141,7 @@ public SetUserProfileImageResponse withUser(com.clerk.backend_api.models.compone
     /**
      * Success
      */
-    public SetUserProfileImageResponse withUser(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+    public SetUserProfileImageResponse withUser(Optional<? extends User> user) {
         Utils.checkNotNull(user, "user");
         this.user = user;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         SetUserProfileImageResponse other = (SetUserProfileImageResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.user, other.user);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.user, other.user);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.User> user = Optional.empty();  
+        private Optional<? extends User> user = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder user(com.clerk.backend_api.models.components.User user) {
+        public Builder user(User user) {
             Utils.checkNotNull(user, "user");
             this.user = Optional.ofNullable(user);
             return this;
@@ -230,7 +234,7 @@ public Builder user(com.clerk.backend_api.models.components.User user) {
         /**
          * Success
          */
-        public Builder user(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+        public Builder user(Optional<? extends User> user) {
             Utils.checkNotNull(user, "user");
             this.user = user;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/Status.java b/src/main/java/com/clerk/backend_api/models/operations/Status.java
index 151fb1c..4d9eba7 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/Status.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/Status.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * Status - Filter sessions by the provided status
diff --git a/src/main/java/com/clerk/backend_api/models/operations/TemplateType.java b/src/main/java/com/clerk/backend_api/models/operations/TemplateType.java
index e5b22ab..ae05f16 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/TemplateType.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/TemplateType.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * TemplateType - The type of templates to list (email or SMS)
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryPathParamTemplateType.java b/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryPathParamTemplateType.java
index 761a01b..a22df54 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryPathParamTemplateType.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryPathParamTemplateType.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * ToggleTemplateDeliveryPathParamTemplateType - The type of template to toggle delivery for
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryRequest.java b/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryRequest.java
index 4ad25dc..c315524 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryRequest.java
@@ -4,18 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class ToggleTemplateDeliveryRequest {
 
     /**
@@ -118,14 +118,14 @@ public boolean equals(java.lang.Object o) {
         }
         ToggleTemplateDeliveryRequest other = (ToggleTemplateDeliveryRequest) o;
         return 
-            java.util.Objects.deepEquals(this.templateType, other.templateType) &&
-            java.util.Objects.deepEquals(this.slug, other.slug) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.templateType, other.templateType) &&
+            Objects.deepEquals(this.slug, other.slug) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             templateType,
             slug,
             requestBody);
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryRequestBody.java
index 725d9ee..41dd1a1 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryRequestBody.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class ToggleTemplateDeliveryRequestBody {
 
     /**
@@ -25,11 +25,11 @@ public class ToggleTemplateDeliveryRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("delivered_by_clerk")
-    private JsonNullable<? extends Boolean> deliveredByClerk;
+    private JsonNullable<Boolean> deliveredByClerk;
 
     @JsonCreator
     public ToggleTemplateDeliveryRequestBody(
-            @JsonProperty("delivered_by_clerk") JsonNullable<? extends Boolean> deliveredByClerk) {
+            @JsonProperty("delivered_by_clerk") JsonNullable<Boolean> deliveredByClerk) {
         Utils.checkNotNull(deliveredByClerk, "deliveredByClerk");
         this.deliveredByClerk = deliveredByClerk;
     }
@@ -41,10 +41,9 @@ public ToggleTemplateDeliveryRequestBody() {
     /**
      * Whether Clerk should deliver emails or SMS messages based on the current template
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> deliveredByClerk() {
-        return (JsonNullable<Boolean>) deliveredByClerk;
+        return deliveredByClerk;
     }
 
     public final static Builder builder() {
@@ -63,7 +62,7 @@ public ToggleTemplateDeliveryRequestBody withDeliveredByClerk(boolean deliveredB
     /**
      * Whether Clerk should deliver emails or SMS messages based on the current template
      */
-    public ToggleTemplateDeliveryRequestBody withDeliveredByClerk(JsonNullable<? extends Boolean> deliveredByClerk) {
+    public ToggleTemplateDeliveryRequestBody withDeliveredByClerk(JsonNullable<Boolean> deliveredByClerk) {
         Utils.checkNotNull(deliveredByClerk, "deliveredByClerk");
         this.deliveredByClerk = deliveredByClerk;
         return this;
@@ -79,12 +78,12 @@ public boolean equals(java.lang.Object o) {
         }
         ToggleTemplateDeliveryRequestBody other = (ToggleTemplateDeliveryRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.deliveredByClerk, other.deliveredByClerk);
+            Objects.deepEquals(this.deliveredByClerk, other.deliveredByClerk);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             deliveredByClerk);
     }
     
@@ -96,7 +95,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private JsonNullable<? extends Boolean> deliveredByClerk = JsonNullable.undefined();  
+        private JsonNullable<Boolean> deliveredByClerk = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -114,7 +113,7 @@ public Builder deliveredByClerk(boolean deliveredByClerk) {
         /**
          * Whether Clerk should deliver emails or SMS messages based on the current template
          */
-        public Builder deliveredByClerk(JsonNullable<? extends Boolean> deliveredByClerk) {
+        public Builder deliveredByClerk(JsonNullable<Boolean> deliveredByClerk) {
             Utils.checkNotNull(deliveredByClerk, "deliveredByClerk");
             this.deliveredByClerk = deliveredByClerk;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryRequestBuilder.java
index 3b4ce28..3880625 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryRequestBuilder.java
@@ -4,18 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.String;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class ToggleTemplateDeliveryRequestBuilder {
 
@@ -28,25 +19,25 @@ public ToggleTemplateDeliveryRequestBuilder(SDKMethodInterfaces.MethodCallToggle
         this.sdk = sdk;
     }
 
-    public ToggleTemplateDeliveryRequestBuilder templateType(ToggleTemplateDeliveryPathParamTemplateType templateType) {
+    public ToggleTemplateDeliveryRequestBuilder templateType(com.clerk.backend_api.models.operations.ToggleTemplateDeliveryPathParamTemplateType templateType) {
         Utils.checkNotNull(templateType, "templateType");
         this.templateType = templateType;
         return this;
     }
 
-    public ToggleTemplateDeliveryRequestBuilder slug(String slug) {
+    public ToggleTemplateDeliveryRequestBuilder slug(java.lang.String slug) {
         Utils.checkNotNull(slug, "slug");
         this.slug = slug;
         return this;
     }
                 
-    public ToggleTemplateDeliveryRequestBuilder requestBody(ToggleTemplateDeliveryRequestBody requestBody) {
+    public ToggleTemplateDeliveryRequestBuilder requestBody(com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = Optional.of(requestBody);
         return this;
     }
 
-    public ToggleTemplateDeliveryRequestBuilder requestBody(Optional<? extends ToggleTemplateDeliveryRequestBody> requestBody) {
+    public ToggleTemplateDeliveryRequestBuilder requestBody(java.util.Optional<? extends com.clerk.backend_api.models.operations.ToggleTemplateDeliveryRequestBody> requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryResponse.java b/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryResponse.java
index 16cb28b..05e4ae3 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/ToggleTemplateDeliveryResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Template;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class ToggleTemplateDeliveryResponse implements com.clerk.backend_api.utils.Response {
+
+public class ToggleTemplateDeliveryResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class ToggleTemplateDeliveryResponse implements com.clerk.backend_api.uti
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Template> template;
+    private Optional<? extends Template> template;
 
     @JsonCreator
     public ToggleTemplateDeliveryResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Template> template) {
+            Optional<? extends Template> template) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Template> template() {
-        return (Optional<com.clerk.backend_api.models.components.Template>) template;
+    public Optional<Template> template() {
+        return (Optional<Template>) template;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public ToggleTemplateDeliveryResponse withRawResponse(HttpResponse<InputStream>
     /**
      * Success
      */
-    public ToggleTemplateDeliveryResponse withTemplate(com.clerk.backend_api.models.components.Template template) {
+    public ToggleTemplateDeliveryResponse withTemplate(Template template) {
         Utils.checkNotNull(template, "template");
         this.template = Optional.ofNullable(template);
         return this;
@@ -137,7 +141,7 @@ public ToggleTemplateDeliveryResponse withTemplate(com.clerk.backend_api.models.
     /**
      * Success
      */
-    public ToggleTemplateDeliveryResponse withTemplate(Optional<? extends com.clerk.backend_api.models.components.Template> template) {
+    public ToggleTemplateDeliveryResponse withTemplate(Optional<? extends Template> template) {
         Utils.checkNotNull(template, "template");
         this.template = template;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         ToggleTemplateDeliveryResponse other = (ToggleTemplateDeliveryResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.template, other.template);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.template, other.template);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Template> template = Optional.empty();  
+        private Optional<? extends Template> template = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder template(com.clerk.backend_api.models.components.Template template) {
+        public Builder template(Template template) {
             Utils.checkNotNull(template, "template");
             this.template = Optional.ofNullable(template);
             return this;
@@ -230,7 +234,7 @@ public Builder template(com.clerk.backend_api.models.components.Template templat
         /**
          * Success
          */
-        public Builder template(Optional<? extends com.clerk.backend_api.models.components.Template> template) {
+        public Builder template(Optional<? extends Template> template) {
             Utils.checkNotNull(template, "template");
             this.template = template;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UnbanUserRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UnbanUserRequest.java
index 959d7d7..463fc84 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UnbanUserRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UnbanUserRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class UnbanUserRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         UnbanUserRequest other = (UnbanUserRequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId);
+            Objects.deepEquals(this.userId, other.userId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UnbanUserRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UnbanUserRequestBuilder.java
index f9d34e5..4db791f 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UnbanUserRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UnbanUserRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class UnbanUserRequestBuilder {
 
@@ -26,7 +16,7 @@ public UnbanUserRequestBuilder(SDKMethodInterfaces.MethodCallUnbanUser sdk) {
         this.sdk = sdk;
     }
 
-    public UnbanUserRequestBuilder userId(String userId) {
+    public UnbanUserRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UnbanUserResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UnbanUserResponse.java
index fb39bb4..98677bf 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UnbanUserResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UnbanUserResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.User;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UnbanUserResponse implements com.clerk.backend_api.utils.Response {
+
+public class UnbanUserResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UnbanUserResponse implements com.clerk.backend_api.utils.Response {
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.User> user;
+    private Optional<? extends User> user;
 
     @JsonCreator
     public UnbanUserResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.User> user) {
+            Optional<? extends User> user) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.User> user() {
-        return (Optional<com.clerk.backend_api.models.components.User>) user;
+    public Optional<User> user() {
+        return (Optional<User>) user;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UnbanUserResponse withRawResponse(HttpResponse<InputStream> rawResponse)
     /**
      * Success
      */
-    public UnbanUserResponse withUser(com.clerk.backend_api.models.components.User user) {
+    public UnbanUserResponse withUser(User user) {
         Utils.checkNotNull(user, "user");
         this.user = Optional.ofNullable(user);
         return this;
@@ -137,7 +141,7 @@ public UnbanUserResponse withUser(com.clerk.backend_api.models.components.User u
     /**
      * Success
      */
-    public UnbanUserResponse withUser(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+    public UnbanUserResponse withUser(Optional<? extends User> user) {
         Utils.checkNotNull(user, "user");
         this.user = user;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UnbanUserResponse other = (UnbanUserResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.user, other.user);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.user, other.user);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.User> user = Optional.empty();  
+        private Optional<? extends User> user = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder user(com.clerk.backend_api.models.components.User user) {
+        public Builder user(User user) {
             Utils.checkNotNull(user, "user");
             this.user = Optional.ofNullable(user);
             return this;
@@ -230,7 +234,7 @@ public Builder user(com.clerk.backend_api.models.components.User user) {
         /**
          * Success
          */
-        public Builder user(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+        public Builder user(Optional<? extends User> user) {
             Utils.checkNotNull(user, "user");
             this.user = user;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UnlockUserRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UnlockUserRequest.java
index ebee073..fe872a0 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UnlockUserRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UnlockUserRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class UnlockUserRequest {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         UnlockUserRequest other = (UnlockUserRequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId);
+            Objects.deepEquals(this.userId, other.userId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UnlockUserRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UnlockUserRequestBuilder.java
index bf02741..9e75810 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UnlockUserRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UnlockUserRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class UnlockUserRequestBuilder {
 
@@ -26,7 +16,7 @@ public UnlockUserRequestBuilder(SDKMethodInterfaces.MethodCallUnlockUser sdk) {
         this.sdk = sdk;
     }
 
-    public UnlockUserRequestBuilder userId(String userId) {
+    public UnlockUserRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UnlockUserResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UnlockUserResponse.java
index 05bd79c..bfea725 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UnlockUserResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UnlockUserResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.User;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UnlockUserResponse implements com.clerk.backend_api.utils.Response {
+
+public class UnlockUserResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UnlockUserResponse implements com.clerk.backend_api.utils.Response
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.User> user;
+    private Optional<? extends User> user;
 
     @JsonCreator
     public UnlockUserResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.User> user) {
+            Optional<? extends User> user) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.User> user() {
-        return (Optional<com.clerk.backend_api.models.components.User>) user;
+    public Optional<User> user() {
+        return (Optional<User>) user;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UnlockUserResponse withRawResponse(HttpResponse<InputStream> rawResponse)
     /**
      * Success
      */
-    public UnlockUserResponse withUser(com.clerk.backend_api.models.components.User user) {
+    public UnlockUserResponse withUser(User user) {
         Utils.checkNotNull(user, "user");
         this.user = Optional.ofNullable(user);
         return this;
@@ -137,7 +141,7 @@ public UnlockUserResponse withUser(com.clerk.backend_api.models.components.User
     /**
      * Success
      */
-    public UnlockUserResponse withUser(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+    public UnlockUserResponse withUser(Optional<? extends User> user) {
         Utils.checkNotNull(user, "user");
         this.user = user;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UnlockUserResponse other = (UnlockUserResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.user, other.user);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.user, other.user);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.User> user = Optional.empty();  
+        private Optional<? extends User> user = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder user(com.clerk.backend_api.models.components.User user) {
+        public Builder user(User user) {
             Utils.checkNotNull(user, "user");
             this.user = Optional.ofNullable(user);
             return this;
@@ -230,7 +234,7 @@ public Builder user(com.clerk.backend_api.models.components.User user) {
         /**
          * Success
          */
-        public Builder user(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+        public Builder user(Optional<? extends User> user) {
             Utils.checkNotNull(user, "user");
             this.user = user;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UnsafeMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/UnsafeMetadata.java
index 9983719..289eed9 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UnsafeMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UnsafeMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * UnsafeMetadata - Metadata saved on the user, that can be updated from both the Frontend and Backend APIs.
  * Note: Since this data can be modified from the frontend, it is not guaranteed to be safe.
@@ -43,7 +41,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainRequest.java
index 71337c9..9936578 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class UpdateDomainRequest {
 
@@ -78,13 +77,13 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateDomainRequest other = (UpdateDomainRequest) o;
         return 
-            java.util.Objects.deepEquals(this.domainId, other.domainId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.domainId, other.domainId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             domainId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainRequestBody.java
index c57199a..c773e31 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainRequestBody.java
@@ -4,20 +4,19 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class UpdateDomainRequestBody {
 
     /**
@@ -27,7 +26,7 @@ public class UpdateDomainRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("name")
-    private JsonNullable<? extends String> name;
+    private JsonNullable<String> name;
 
     /**
      * The full URL of the proxy that will forward requests to Clerk's Frontend API.
@@ -35,12 +34,12 @@ public class UpdateDomainRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("proxy_url")
-    private JsonNullable<? extends String> proxyUrl;
+    private JsonNullable<String> proxyUrl;
 
     @JsonCreator
     public UpdateDomainRequestBody(
-            @JsonProperty("name") JsonNullable<? extends String> name,
-            @JsonProperty("proxy_url") JsonNullable<? extends String> proxyUrl) {
+            @JsonProperty("name") JsonNullable<String> name,
+            @JsonProperty("proxy_url") JsonNullable<String> proxyUrl) {
         Utils.checkNotNull(name, "name");
         Utils.checkNotNull(proxyUrl, "proxyUrl");
         this.name = name;
@@ -56,20 +55,18 @@ public UpdateDomainRequestBody() {
      * i.e `myhostname:3000`. For production instances, must be a valid FQDN,
      * i.e `mysite.com`. Cannot contain protocol scheme.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> name() {
-        return (JsonNullable<String>) name;
+        return name;
     }
 
     /**
      * The full URL of the proxy that will forward requests to Clerk's Frontend API.
      * Can only be updated for production instances.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> proxyUrl() {
-        return (JsonNullable<String>) proxyUrl;
+        return proxyUrl;
     }
 
     public final static Builder builder() {
@@ -92,7 +89,7 @@ public UpdateDomainRequestBody withName(String name) {
      * i.e `myhostname:3000`. For production instances, must be a valid FQDN,
      * i.e `mysite.com`. Cannot contain protocol scheme.
      */
-    public UpdateDomainRequestBody withName(JsonNullable<? extends String> name) {
+    public UpdateDomainRequestBody withName(JsonNullable<String> name) {
         Utils.checkNotNull(name, "name");
         this.name = name;
         return this;
@@ -112,7 +109,7 @@ public UpdateDomainRequestBody withProxyUrl(String proxyUrl) {
      * The full URL of the proxy that will forward requests to Clerk's Frontend API.
      * Can only be updated for production instances.
      */
-    public UpdateDomainRequestBody withProxyUrl(JsonNullable<? extends String> proxyUrl) {
+    public UpdateDomainRequestBody withProxyUrl(JsonNullable<String> proxyUrl) {
         Utils.checkNotNull(proxyUrl, "proxyUrl");
         this.proxyUrl = proxyUrl;
         return this;
@@ -128,13 +125,13 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateDomainRequestBody other = (UpdateDomainRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.proxyUrl, other.proxyUrl);
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.proxyUrl, other.proxyUrl);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             name,
             proxyUrl);
     }
@@ -148,9 +145,9 @@ public String toString() {
     
     public final static class Builder {
  
-        private JsonNullable<? extends String> name = JsonNullable.undefined();
+        private JsonNullable<String> name = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> proxyUrl = JsonNullable.undefined();  
+        private JsonNullable<String> proxyUrl = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -172,7 +169,7 @@ public Builder name(String name) {
          * i.e `myhostname:3000`. For production instances, must be a valid FQDN,
          * i.e `mysite.com`. Cannot contain protocol scheme.
          */
-        public Builder name(JsonNullable<? extends String> name) {
+        public Builder name(JsonNullable<String> name) {
             Utils.checkNotNull(name, "name");
             this.name = name;
             return this;
@@ -192,7 +189,7 @@ public Builder proxyUrl(String proxyUrl) {
          * The full URL of the proxy that will forward requests to Clerk's Frontend API.
          * Can only be updated for production instances.
          */
-        public Builder proxyUrl(JsonNullable<? extends String> proxyUrl) {
+        public Builder proxyUrl(JsonNullable<String> proxyUrl) {
             Utils.checkNotNull(proxyUrl, "proxyUrl");
             this.proxyUrl = proxyUrl;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainRequestBuilder.java
index 12d5458..485b43a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class UpdateDomainRequestBuilder {
 
@@ -27,13 +17,13 @@ public UpdateDomainRequestBuilder(SDKMethodInterfaces.MethodCallUpdateDomain sdk
         this.sdk = sdk;
     }
 
-    public UpdateDomainRequestBuilder domainId(String domainId) {
+    public UpdateDomainRequestBuilder domainId(java.lang.String domainId) {
         Utils.checkNotNull(domainId, "domainId");
         this.domainId = domainId;
         return this;
     }
 
-    public UpdateDomainRequestBuilder requestBody(UpdateDomainRequestBody requestBody) {
+    public UpdateDomainRequestBuilder requestBody(com.clerk.backend_api.models.operations.UpdateDomainRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainResponse.java
index 2e0110f..8f88ce0 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateDomainResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Domain;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdateDomainResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdateDomainResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdateDomainResponse implements com.clerk.backend_api.utils.Respons
     /**
      * A domain
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Domain> domain;
+    private Optional<? extends Domain> domain;
 
     @JsonCreator
     public UpdateDomainResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Domain> domain) {
+            Optional<? extends Domain> domain) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Domain> domain() {
-        return (Optional<com.clerk.backend_api.models.components.Domain>) domain;
+    public Optional<Domain> domain() {
+        return (Optional<Domain>) domain;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdateDomainResponse withRawResponse(HttpResponse<InputStream> rawRespons
     /**
      * A domain
      */
-    public UpdateDomainResponse withDomain(com.clerk.backend_api.models.components.Domain domain) {
+    public UpdateDomainResponse withDomain(Domain domain) {
         Utils.checkNotNull(domain, "domain");
         this.domain = Optional.ofNullable(domain);
         return this;
@@ -137,7 +141,7 @@ public UpdateDomainResponse withDomain(com.clerk.backend_api.models.components.D
     /**
      * A domain
      */
-    public UpdateDomainResponse withDomain(Optional<? extends com.clerk.backend_api.models.components.Domain> domain) {
+    public UpdateDomainResponse withDomain(Optional<? extends Domain> domain) {
         Utils.checkNotNull(domain, "domain");
         this.domain = domain;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateDomainResponse other = (UpdateDomainResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.domain, other.domain);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.domain, other.domain);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Domain> domain = Optional.empty();  
+        private Optional<? extends Domain> domain = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A domain
          */
-        public Builder domain(com.clerk.backend_api.models.components.Domain domain) {
+        public Builder domain(Domain domain) {
             Utils.checkNotNull(domain, "domain");
             this.domain = Optional.ofNullable(domain);
             return this;
@@ -230,7 +234,7 @@ public Builder domain(com.clerk.backend_api.models.components.Domain domain) {
         /**
          * A domain
          */
-        public Builder domain(Optional<? extends com.clerk.backend_api.models.components.Domain> domain) {
+        public Builder domain(Optional<? extends Domain> domain) {
             Utils.checkNotNull(domain, "domain");
             this.domain = domain;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressRequest.java
index c337af4..9a7ede1 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressRequest.java
@@ -4,18 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class UpdateEmailAddressRequest {
 
     /**
@@ -91,13 +91,13 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateEmailAddressRequest other = (UpdateEmailAddressRequest) o;
         return 
-            java.util.Objects.deepEquals(this.emailAddressId, other.emailAddressId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.emailAddressId, other.emailAddressId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             emailAddressId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressRequestBody.java
index 7b1fd1e..4a22f27 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressRequestBody.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class UpdateEmailAddressRequestBody {
 
     /**
@@ -25,19 +25,19 @@ public class UpdateEmailAddressRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("verified")
-    private JsonNullable<? extends Boolean> verified;
+    private JsonNullable<Boolean> verified;
 
     /**
      * Set this email address as the primary email address for the user.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("primary")
-    private JsonNullable<? extends Boolean> primary;
+    private JsonNullable<Boolean> primary;
 
     @JsonCreator
     public UpdateEmailAddressRequestBody(
-            @JsonProperty("verified") JsonNullable<? extends Boolean> verified,
-            @JsonProperty("primary") JsonNullable<? extends Boolean> primary) {
+            @JsonProperty("verified") JsonNullable<Boolean> verified,
+            @JsonProperty("primary") JsonNullable<Boolean> primary) {
         Utils.checkNotNull(verified, "verified");
         Utils.checkNotNull(primary, "primary");
         this.verified = verified;
@@ -51,19 +51,17 @@ public UpdateEmailAddressRequestBody() {
     /**
      * The email address will be marked as verified.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> verified() {
-        return (JsonNullable<Boolean>) verified;
+        return verified;
     }
 
     /**
      * Set this email address as the primary email address for the user.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> primary() {
-        return (JsonNullable<Boolean>) primary;
+        return primary;
     }
 
     public final static Builder builder() {
@@ -82,7 +80,7 @@ public UpdateEmailAddressRequestBody withVerified(boolean verified) {
     /**
      * The email address will be marked as verified.
      */
-    public UpdateEmailAddressRequestBody withVerified(JsonNullable<? extends Boolean> verified) {
+    public UpdateEmailAddressRequestBody withVerified(JsonNullable<Boolean> verified) {
         Utils.checkNotNull(verified, "verified");
         this.verified = verified;
         return this;
@@ -100,7 +98,7 @@ public UpdateEmailAddressRequestBody withPrimary(boolean primary) {
     /**
      * Set this email address as the primary email address for the user.
      */
-    public UpdateEmailAddressRequestBody withPrimary(JsonNullable<? extends Boolean> primary) {
+    public UpdateEmailAddressRequestBody withPrimary(JsonNullable<Boolean> primary) {
         Utils.checkNotNull(primary, "primary");
         this.primary = primary;
         return this;
@@ -116,13 +114,13 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateEmailAddressRequestBody other = (UpdateEmailAddressRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.verified, other.verified) &&
-            java.util.Objects.deepEquals(this.primary, other.primary);
+            Objects.deepEquals(this.verified, other.verified) &&
+            Objects.deepEquals(this.primary, other.primary);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             verified,
             primary);
     }
@@ -136,9 +134,9 @@ public String toString() {
     
     public final static class Builder {
  
-        private JsonNullable<? extends Boolean> verified = JsonNullable.undefined();
+        private JsonNullable<Boolean> verified = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> primary = JsonNullable.undefined();  
+        private JsonNullable<Boolean> primary = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -156,7 +154,7 @@ public Builder verified(boolean verified) {
         /**
          * The email address will be marked as verified.
          */
-        public Builder verified(JsonNullable<? extends Boolean> verified) {
+        public Builder verified(JsonNullable<Boolean> verified) {
             Utils.checkNotNull(verified, "verified");
             this.verified = verified;
             return this;
@@ -174,7 +172,7 @@ public Builder primary(boolean primary) {
         /**
          * Set this email address as the primary email address for the user.
          */
-        public Builder primary(JsonNullable<? extends Boolean> primary) {
+        public Builder primary(JsonNullable<Boolean> primary) {
             Utils.checkNotNull(primary, "primary");
             this.primary = primary;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressRequestBuilder.java
index 14828aa..ada4d89 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressRequestBuilder.java
@@ -4,18 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.String;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class UpdateEmailAddressRequestBuilder {
 
@@ -27,19 +18,19 @@ public UpdateEmailAddressRequestBuilder(SDKMethodInterfaces.MethodCallUpdateEmai
         this.sdk = sdk;
     }
 
-    public UpdateEmailAddressRequestBuilder emailAddressId(String emailAddressId) {
+    public UpdateEmailAddressRequestBuilder emailAddressId(java.lang.String emailAddressId) {
         Utils.checkNotNull(emailAddressId, "emailAddressId");
         this.emailAddressId = emailAddressId;
         return this;
     }
                 
-    public UpdateEmailAddressRequestBuilder requestBody(UpdateEmailAddressRequestBody requestBody) {
+    public UpdateEmailAddressRequestBuilder requestBody(com.clerk.backend_api.models.operations.UpdateEmailAddressRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = Optional.of(requestBody);
         return this;
     }
 
-    public UpdateEmailAddressRequestBuilder requestBody(Optional<? extends UpdateEmailAddressRequestBody> requestBody) {
+    public UpdateEmailAddressRequestBuilder requestBody(java.util.Optional<? extends com.clerk.backend_api.models.operations.UpdateEmailAddressRequestBody> requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressResponse.java
index ecc5e45..b33e605 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateEmailAddressResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.EmailAddress;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdateEmailAddressResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdateEmailAddressResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdateEmailAddressResponse implements com.clerk.backend_api.utils.R
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress;
+    private Optional<? extends EmailAddress> emailAddress;
 
     @JsonCreator
     public UpdateEmailAddressResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress) {
+            Optional<? extends EmailAddress> emailAddress) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.EmailAddress> emailAddress() {
-        return (Optional<com.clerk.backend_api.models.components.EmailAddress>) emailAddress;
+    public Optional<EmailAddress> emailAddress() {
+        return (Optional<EmailAddress>) emailAddress;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdateEmailAddressResponse withRawResponse(HttpResponse<InputStream> rawR
     /**
      * Success
      */
-    public UpdateEmailAddressResponse withEmailAddress(com.clerk.backend_api.models.components.EmailAddress emailAddress) {
+    public UpdateEmailAddressResponse withEmailAddress(EmailAddress emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = Optional.ofNullable(emailAddress);
         return this;
@@ -137,7 +141,7 @@ public UpdateEmailAddressResponse withEmailAddress(com.clerk.backend_api.models.
     /**
      * Success
      */
-    public UpdateEmailAddressResponse withEmailAddress(Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress) {
+    public UpdateEmailAddressResponse withEmailAddress(Optional<? extends EmailAddress> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = emailAddress;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateEmailAddressResponse other = (UpdateEmailAddressResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.emailAddress, other.emailAddress);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress = Optional.empty();  
+        private Optional<? extends EmailAddress> emailAddress = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder emailAddress(com.clerk.backend_api.models.components.EmailAddress emailAddress) {
+        public Builder emailAddress(EmailAddress emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = Optional.ofNullable(emailAddress);
             return this;
@@ -230,7 +234,7 @@ public Builder emailAddress(com.clerk.backend_api.models.components.EmailAddress
         /**
          * Success
          */
-        public Builder emailAddress(Optional<? extends com.clerk.backend_api.models.components.EmailAddress> emailAddress) {
+        public Builder emailAddress(Optional<? extends EmailAddress> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = emailAddress;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceAuthConfigRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceAuthConfigRequestBody.java
index 9c48174..0ca784f 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceAuthConfigRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceAuthConfigRequestBody.java
@@ -4,21 +4,22 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class UpdateInstanceAuthConfigRequestBody {
 
     /**
@@ -26,7 +27,7 @@ public class UpdateInstanceAuthConfigRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("restricted_to_allowlist")
-    private JsonNullable<? extends Boolean> restrictedToAllowlist;
+    private JsonNullable<Boolean> restrictedToAllowlist;
 
     /**
      * The local part of the email address from which authentication-related emails (e.g. OTP code, magic links) will be sent.
@@ -35,21 +36,21 @@ public class UpdateInstanceAuthConfigRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("from_email_address")
-    private JsonNullable<? extends String> fromEmailAddress;
+    private JsonNullable<String> fromEmailAddress;
 
     /**
      * Enable the Progressive Sign Up algorithm. Refer to the [docs](https://clerk.com/docs/upgrade-guides/progressive-sign-up) for more info.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("progressive_sign_up")
-    private JsonNullable<? extends Boolean> progressiveSignUp;
+    private JsonNullable<Boolean> progressiveSignUp;
 
     /**
      * The name of the JWT Template used to augment your session tokens. To disable this, pass an empty string.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("session_token_template")
-    private JsonNullable<? extends String> sessionTokenTemplate;
+    private JsonNullable<String> sessionTokenTemplate;
 
     /**
      * The "enhanced_email_deliverability" feature will send emails from "verifications@clerk.dev" instead of your domain.
@@ -57,7 +58,7 @@ public class UpdateInstanceAuthConfigRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("enhanced_email_deliverability")
-    private JsonNullable<? extends Boolean> enhancedEmailDeliverability;
+    private JsonNullable<Boolean> enhancedEmailDeliverability;
 
     /**
      * Toggles test mode for this instance, allowing the use of test email addresses and phone numbers.
@@ -65,16 +66,16 @@ public class UpdateInstanceAuthConfigRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("test_mode")
-    private JsonNullable<? extends Boolean> testMode;
+    private JsonNullable<Boolean> testMode;
 
     @JsonCreator
     public UpdateInstanceAuthConfigRequestBody(
-            @JsonProperty("restricted_to_allowlist") JsonNullable<? extends Boolean> restrictedToAllowlist,
-            @JsonProperty("from_email_address") JsonNullable<? extends String> fromEmailAddress,
-            @JsonProperty("progressive_sign_up") JsonNullable<? extends Boolean> progressiveSignUp,
-            @JsonProperty("session_token_template") JsonNullable<? extends String> sessionTokenTemplate,
-            @JsonProperty("enhanced_email_deliverability") JsonNullable<? extends Boolean> enhancedEmailDeliverability,
-            @JsonProperty("test_mode") JsonNullable<? extends Boolean> testMode) {
+            @JsonProperty("restricted_to_allowlist") JsonNullable<Boolean> restrictedToAllowlist,
+            @JsonProperty("from_email_address") JsonNullable<String> fromEmailAddress,
+            @JsonProperty("progressive_sign_up") JsonNullable<Boolean> progressiveSignUp,
+            @JsonProperty("session_token_template") JsonNullable<String> sessionTokenTemplate,
+            @JsonProperty("enhanced_email_deliverability") JsonNullable<Boolean> enhancedEmailDeliverability,
+            @JsonProperty("test_mode") JsonNullable<Boolean> testMode) {
         Utils.checkNotNull(restrictedToAllowlist, "restrictedToAllowlist");
         Utils.checkNotNull(fromEmailAddress, "fromEmailAddress");
         Utils.checkNotNull(progressiveSignUp, "progressiveSignUp");
@@ -96,10 +97,9 @@ public UpdateInstanceAuthConfigRequestBody() {
     /**
      * Whether sign up is restricted to email addresses, phone numbers and usernames that are on the allowlist.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> restrictedToAllowlist() {
-        return (JsonNullable<Boolean>) restrictedToAllowlist;
+        return restrictedToAllowlist;
     }
 
     /**
@@ -107,48 +107,43 @@ public JsonNullable<Boolean> restrictedToAllowlist() {
      * Only alphanumeric values are allowed.
      * Note that this value should contain only the local part of the address (e.g. `foo` for `foo@example.com`).
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> fromEmailAddress() {
-        return (JsonNullable<String>) fromEmailAddress;
+        return fromEmailAddress;
     }
 
     /**
      * Enable the Progressive Sign Up algorithm. Refer to the [docs](https://clerk.com/docs/upgrade-guides/progressive-sign-up) for more info.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> progressiveSignUp() {
-        return (JsonNullable<Boolean>) progressiveSignUp;
+        return progressiveSignUp;
     }
 
     /**
      * The name of the JWT Template used to augment your session tokens. To disable this, pass an empty string.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> sessionTokenTemplate() {
-        return (JsonNullable<String>) sessionTokenTemplate;
+        return sessionTokenTemplate;
     }
 
     /**
      * The "enhanced_email_deliverability" feature will send emails from "verifications@clerk.dev" instead of your domain.
      * This can be helpful if you do not have a high domain reputation.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> enhancedEmailDeliverability() {
-        return (JsonNullable<Boolean>) enhancedEmailDeliverability;
+        return enhancedEmailDeliverability;
     }
 
     /**
      * Toggles test mode for this instance, allowing the use of test email addresses and phone numbers.
      * Defaults to true for development instances.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> testMode() {
-        return (JsonNullable<Boolean>) testMode;
+        return testMode;
     }
 
     public final static Builder builder() {
@@ -167,7 +162,7 @@ public UpdateInstanceAuthConfigRequestBody withRestrictedToAllowlist(boolean res
     /**
      * Whether sign up is restricted to email addresses, phone numbers and usernames that are on the allowlist.
      */
-    public UpdateInstanceAuthConfigRequestBody withRestrictedToAllowlist(JsonNullable<? extends Boolean> restrictedToAllowlist) {
+    public UpdateInstanceAuthConfigRequestBody withRestrictedToAllowlist(JsonNullable<Boolean> restrictedToAllowlist) {
         Utils.checkNotNull(restrictedToAllowlist, "restrictedToAllowlist");
         this.restrictedToAllowlist = restrictedToAllowlist;
         return this;
@@ -189,7 +184,7 @@ public UpdateInstanceAuthConfigRequestBody withFromEmailAddress(String fromEmail
      * Only alphanumeric values are allowed.
      * Note that this value should contain only the local part of the address (e.g. `foo` for `foo@example.com`).
      */
-    public UpdateInstanceAuthConfigRequestBody withFromEmailAddress(JsonNullable<? extends String> fromEmailAddress) {
+    public UpdateInstanceAuthConfigRequestBody withFromEmailAddress(JsonNullable<String> fromEmailAddress) {
         Utils.checkNotNull(fromEmailAddress, "fromEmailAddress");
         this.fromEmailAddress = fromEmailAddress;
         return this;
@@ -207,7 +202,7 @@ public UpdateInstanceAuthConfigRequestBody withProgressiveSignUp(boolean progres
     /**
      * Enable the Progressive Sign Up algorithm. Refer to the [docs](https://clerk.com/docs/upgrade-guides/progressive-sign-up) for more info.
      */
-    public UpdateInstanceAuthConfigRequestBody withProgressiveSignUp(JsonNullable<? extends Boolean> progressiveSignUp) {
+    public UpdateInstanceAuthConfigRequestBody withProgressiveSignUp(JsonNullable<Boolean> progressiveSignUp) {
         Utils.checkNotNull(progressiveSignUp, "progressiveSignUp");
         this.progressiveSignUp = progressiveSignUp;
         return this;
@@ -225,7 +220,7 @@ public UpdateInstanceAuthConfigRequestBody withSessionTokenTemplate(String sessi
     /**
      * The name of the JWT Template used to augment your session tokens. To disable this, pass an empty string.
      */
-    public UpdateInstanceAuthConfigRequestBody withSessionTokenTemplate(JsonNullable<? extends String> sessionTokenTemplate) {
+    public UpdateInstanceAuthConfigRequestBody withSessionTokenTemplate(JsonNullable<String> sessionTokenTemplate) {
         Utils.checkNotNull(sessionTokenTemplate, "sessionTokenTemplate");
         this.sessionTokenTemplate = sessionTokenTemplate;
         return this;
@@ -245,7 +240,7 @@ public UpdateInstanceAuthConfigRequestBody withEnhancedEmailDeliverability(boole
      * The "enhanced_email_deliverability" feature will send emails from "verifications@clerk.dev" instead of your domain.
      * This can be helpful if you do not have a high domain reputation.
      */
-    public UpdateInstanceAuthConfigRequestBody withEnhancedEmailDeliverability(JsonNullable<? extends Boolean> enhancedEmailDeliverability) {
+    public UpdateInstanceAuthConfigRequestBody withEnhancedEmailDeliverability(JsonNullable<Boolean> enhancedEmailDeliverability) {
         Utils.checkNotNull(enhancedEmailDeliverability, "enhancedEmailDeliverability");
         this.enhancedEmailDeliverability = enhancedEmailDeliverability;
         return this;
@@ -265,7 +260,7 @@ public UpdateInstanceAuthConfigRequestBody withTestMode(boolean testMode) {
      * Toggles test mode for this instance, allowing the use of test email addresses and phone numbers.
      * Defaults to true for development instances.
      */
-    public UpdateInstanceAuthConfigRequestBody withTestMode(JsonNullable<? extends Boolean> testMode) {
+    public UpdateInstanceAuthConfigRequestBody withTestMode(JsonNullable<Boolean> testMode) {
         Utils.checkNotNull(testMode, "testMode");
         this.testMode = testMode;
         return this;
@@ -281,17 +276,17 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateInstanceAuthConfigRequestBody other = (UpdateInstanceAuthConfigRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.restrictedToAllowlist, other.restrictedToAllowlist) &&
-            java.util.Objects.deepEquals(this.fromEmailAddress, other.fromEmailAddress) &&
-            java.util.Objects.deepEquals(this.progressiveSignUp, other.progressiveSignUp) &&
-            java.util.Objects.deepEquals(this.sessionTokenTemplate, other.sessionTokenTemplate) &&
-            java.util.Objects.deepEquals(this.enhancedEmailDeliverability, other.enhancedEmailDeliverability) &&
-            java.util.Objects.deepEquals(this.testMode, other.testMode);
+            Objects.deepEquals(this.restrictedToAllowlist, other.restrictedToAllowlist) &&
+            Objects.deepEquals(this.fromEmailAddress, other.fromEmailAddress) &&
+            Objects.deepEquals(this.progressiveSignUp, other.progressiveSignUp) &&
+            Objects.deepEquals(this.sessionTokenTemplate, other.sessionTokenTemplate) &&
+            Objects.deepEquals(this.enhancedEmailDeliverability, other.enhancedEmailDeliverability) &&
+            Objects.deepEquals(this.testMode, other.testMode);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             restrictedToAllowlist,
             fromEmailAddress,
             progressiveSignUp,
@@ -313,17 +308,17 @@ public String toString() {
     
     public final static class Builder {
  
-        private JsonNullable<? extends Boolean> restrictedToAllowlist;
+        private JsonNullable<Boolean> restrictedToAllowlist;
  
-        private JsonNullable<? extends String> fromEmailAddress = JsonNullable.undefined();
+        private JsonNullable<String> fromEmailAddress = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> progressiveSignUp = JsonNullable.undefined();
+        private JsonNullable<Boolean> progressiveSignUp = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> sessionTokenTemplate = JsonNullable.undefined();
+        private JsonNullable<String> sessionTokenTemplate = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> enhancedEmailDeliverability = JsonNullable.undefined();
+        private JsonNullable<Boolean> enhancedEmailDeliverability = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> testMode = JsonNullable.undefined();  
+        private JsonNullable<Boolean> testMode = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -341,7 +336,7 @@ public Builder restrictedToAllowlist(boolean restrictedToAllowlist) {
         /**
          * Whether sign up is restricted to email addresses, phone numbers and usernames that are on the allowlist.
          */
-        public Builder restrictedToAllowlist(JsonNullable<? extends Boolean> restrictedToAllowlist) {
+        public Builder restrictedToAllowlist(JsonNullable<Boolean> restrictedToAllowlist) {
             Utils.checkNotNull(restrictedToAllowlist, "restrictedToAllowlist");
             this.restrictedToAllowlist = restrictedToAllowlist;
             return this;
@@ -363,7 +358,7 @@ public Builder fromEmailAddress(String fromEmailAddress) {
          * Only alphanumeric values are allowed.
          * Note that this value should contain only the local part of the address (e.g. `foo` for `foo@example.com`).
          */
-        public Builder fromEmailAddress(JsonNullable<? extends String> fromEmailAddress) {
+        public Builder fromEmailAddress(JsonNullable<String> fromEmailAddress) {
             Utils.checkNotNull(fromEmailAddress, "fromEmailAddress");
             this.fromEmailAddress = fromEmailAddress;
             return this;
@@ -381,7 +376,7 @@ public Builder progressiveSignUp(boolean progressiveSignUp) {
         /**
          * Enable the Progressive Sign Up algorithm. Refer to the [docs](https://clerk.com/docs/upgrade-guides/progressive-sign-up) for more info.
          */
-        public Builder progressiveSignUp(JsonNullable<? extends Boolean> progressiveSignUp) {
+        public Builder progressiveSignUp(JsonNullable<Boolean> progressiveSignUp) {
             Utils.checkNotNull(progressiveSignUp, "progressiveSignUp");
             this.progressiveSignUp = progressiveSignUp;
             return this;
@@ -399,7 +394,7 @@ public Builder sessionTokenTemplate(String sessionTokenTemplate) {
         /**
          * The name of the JWT Template used to augment your session tokens. To disable this, pass an empty string.
          */
-        public Builder sessionTokenTemplate(JsonNullable<? extends String> sessionTokenTemplate) {
+        public Builder sessionTokenTemplate(JsonNullable<String> sessionTokenTemplate) {
             Utils.checkNotNull(sessionTokenTemplate, "sessionTokenTemplate");
             this.sessionTokenTemplate = sessionTokenTemplate;
             return this;
@@ -419,7 +414,7 @@ public Builder enhancedEmailDeliverability(boolean enhancedEmailDeliverability)
          * The "enhanced_email_deliverability" feature will send emails from "verifications@clerk.dev" instead of your domain.
          * This can be helpful if you do not have a high domain reputation.
          */
-        public Builder enhancedEmailDeliverability(JsonNullable<? extends Boolean> enhancedEmailDeliverability) {
+        public Builder enhancedEmailDeliverability(JsonNullable<Boolean> enhancedEmailDeliverability) {
             Utils.checkNotNull(enhancedEmailDeliverability, "enhancedEmailDeliverability");
             this.enhancedEmailDeliverability = enhancedEmailDeliverability;
             return this;
@@ -439,7 +434,7 @@ public Builder testMode(boolean testMode) {
          * Toggles test mode for this instance, allowing the use of test email addresses and phone numbers.
          * Defaults to true for development instances.
          */
-        public Builder testMode(JsonNullable<? extends Boolean> testMode) {
+        public Builder testMode(JsonNullable<Boolean> testMode) {
             Utils.checkNotNull(testMode, "testMode");
             this.testMode = testMode;
             return this;
@@ -458,11 +453,11 @@ public UpdateInstanceAuthConfigRequestBody build() {
                 testMode);
         }
 
-        private static final LazySingletonValue<JsonNullable<? extends Boolean>> _SINGLETON_VALUE_RestrictedToAllowlist =
+        private static final LazySingletonValue<JsonNullable<Boolean>> _SINGLETON_VALUE_RestrictedToAllowlist =
                 new LazySingletonValue<>(
                         "restricted_to_allowlist",
                         "false",
-                        new TypeReference<JsonNullable<? extends Boolean>>() {});
+                        new TypeReference<JsonNullable<Boolean>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceAuthConfigRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceAuthConfigRequestBuilder.java
index 990e09d..6e7b722 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceAuthConfigRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceAuthConfigRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class UpdateInstanceAuthConfigRequestBuilder {
 
@@ -26,13 +16,13 @@ public UpdateInstanceAuthConfigRequestBuilder(SDKMethodInterfaces.MethodCallUpda
         this.sdk = sdk;
     }
                 
-    public UpdateInstanceAuthConfigRequestBuilder request(UpdateInstanceAuthConfigRequestBody request) {
+    public UpdateInstanceAuthConfigRequestBuilder request(com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public UpdateInstanceAuthConfigRequestBuilder request(Optional<? extends UpdateInstanceAuthConfigRequestBody> request) {
+    public UpdateInstanceAuthConfigRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceAuthConfigRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceAuthConfigResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceAuthConfigResponse.java
index d7f1954..74c37fe 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceAuthConfigResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceAuthConfigResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.InstanceSettings;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdateInstanceAuthConfigResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdateInstanceAuthConfigResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdateInstanceAuthConfigResponse implements com.clerk.backend_api.u
     /**
      * InstanceSettings Server API
      */
-    private Optional<? extends com.clerk.backend_api.models.components.InstanceSettings> instanceSettings;
+    private Optional<? extends InstanceSettings> instanceSettings;
 
     @JsonCreator
     public UpdateInstanceAuthConfigResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.InstanceSettings> instanceSettings) {
+            Optional<? extends InstanceSettings> instanceSettings) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.InstanceSettings> instanceSettings() {
-        return (Optional<com.clerk.backend_api.models.components.InstanceSettings>) instanceSettings;
+    public Optional<InstanceSettings> instanceSettings() {
+        return (Optional<InstanceSettings>) instanceSettings;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdateInstanceAuthConfigResponse withRawResponse(HttpResponse<InputStream
     /**
      * InstanceSettings Server API
      */
-    public UpdateInstanceAuthConfigResponse withInstanceSettings(com.clerk.backend_api.models.components.InstanceSettings instanceSettings) {
+    public UpdateInstanceAuthConfigResponse withInstanceSettings(InstanceSettings instanceSettings) {
         Utils.checkNotNull(instanceSettings, "instanceSettings");
         this.instanceSettings = Optional.ofNullable(instanceSettings);
         return this;
@@ -137,7 +141,7 @@ public UpdateInstanceAuthConfigResponse withInstanceSettings(com.clerk.backend_a
     /**
      * InstanceSettings Server API
      */
-    public UpdateInstanceAuthConfigResponse withInstanceSettings(Optional<? extends com.clerk.backend_api.models.components.InstanceSettings> instanceSettings) {
+    public UpdateInstanceAuthConfigResponse withInstanceSettings(Optional<? extends InstanceSettings> instanceSettings) {
         Utils.checkNotNull(instanceSettings, "instanceSettings");
         this.instanceSettings = instanceSettings;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateInstanceAuthConfigResponse other = (UpdateInstanceAuthConfigResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.instanceSettings, other.instanceSettings);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.instanceSettings, other.instanceSettings);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.InstanceSettings> instanceSettings = Optional.empty();  
+        private Optional<? extends InstanceSettings> instanceSettings = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * InstanceSettings Server API
          */
-        public Builder instanceSettings(com.clerk.backend_api.models.components.InstanceSettings instanceSettings) {
+        public Builder instanceSettings(InstanceSettings instanceSettings) {
             Utils.checkNotNull(instanceSettings, "instanceSettings");
             this.instanceSettings = Optional.ofNullable(instanceSettings);
             return this;
@@ -230,7 +234,7 @@ public Builder instanceSettings(com.clerk.backend_api.models.components.Instance
         /**
          * InstanceSettings Server API
          */
-        public Builder instanceSettings(Optional<? extends com.clerk.backend_api.models.components.InstanceSettings> instanceSettings) {
+        public Builder instanceSettings(Optional<? extends InstanceSettings> instanceSettings) {
             Utils.checkNotNull(instanceSettings, "instanceSettings");
             this.instanceSettings = instanceSettings;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceOrganizationSettingsRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceOrganizationSettingsRequestBody.java
index 27865a4..3c36d85 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceOrganizationSettingsRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceOrganizationSettingsRequestBody.java
@@ -4,38 +4,41 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class UpdateInstanceOrganizationSettingsRequestBody {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("enabled")
-    private JsonNullable<? extends Boolean> enabled;
+    private JsonNullable<Boolean> enabled;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("max_allowed_memberships")
-    private JsonNullable<? extends Long> maxAllowedMemberships;
+    private JsonNullable<Long> maxAllowedMemberships;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("admin_delete_enabled")
-    private JsonNullable<? extends Boolean> adminDeleteEnabled;
+    private JsonNullable<Boolean> adminDeleteEnabled;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("domains_enabled")
-    private JsonNullable<? extends Boolean> domainsEnabled;
+    private JsonNullable<Boolean> domainsEnabled;
 
     /**
      * Specify which enrollment modes to enable for your Organization Domains.
@@ -43,31 +46,31 @@ public class UpdateInstanceOrganizationSettingsRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("domains_enrollment_modes")
-    private Optional<? extends java.util.List<String>> domainsEnrollmentModes;
+    private Optional<? extends List<String>> domainsEnrollmentModes;
 
     /**
      * Specify what the default organization role is for an organization creator.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("creator_role_id")
-    private Optional<? extends String> creatorRoleId;
+    private Optional<String> creatorRoleId;
 
     /**
      * Specify what the default organization role is for the organization domains.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("domains_default_role_id")
-    private Optional<? extends String> domainsDefaultRoleId;
+    private Optional<String> domainsDefaultRoleId;
 
     @JsonCreator
     public UpdateInstanceOrganizationSettingsRequestBody(
-            @JsonProperty("enabled") JsonNullable<? extends Boolean> enabled,
-            @JsonProperty("max_allowed_memberships") JsonNullable<? extends Long> maxAllowedMemberships,
-            @JsonProperty("admin_delete_enabled") JsonNullable<? extends Boolean> adminDeleteEnabled,
-            @JsonProperty("domains_enabled") JsonNullable<? extends Boolean> domainsEnabled,
-            @JsonProperty("domains_enrollment_modes") Optional<? extends java.util.List<String>> domainsEnrollmentModes,
-            @JsonProperty("creator_role_id") Optional<? extends String> creatorRoleId,
-            @JsonProperty("domains_default_role_id") Optional<? extends String> domainsDefaultRoleId) {
+            @JsonProperty("enabled") JsonNullable<Boolean> enabled,
+            @JsonProperty("max_allowed_memberships") JsonNullable<Long> maxAllowedMemberships,
+            @JsonProperty("admin_delete_enabled") JsonNullable<Boolean> adminDeleteEnabled,
+            @JsonProperty("domains_enabled") JsonNullable<Boolean> domainsEnabled,
+            @JsonProperty("domains_enrollment_modes") Optional<? extends List<String>> domainsEnrollmentModes,
+            @JsonProperty("creator_role_id") Optional<String> creatorRoleId,
+            @JsonProperty("domains_default_role_id") Optional<String> domainsDefaultRoleId) {
         Utils.checkNotNull(enabled, "enabled");
         Utils.checkNotNull(maxAllowedMemberships, "maxAllowedMemberships");
         Utils.checkNotNull(adminDeleteEnabled, "adminDeleteEnabled");
@@ -88,28 +91,24 @@ public UpdateInstanceOrganizationSettingsRequestBody() {
         this(JsonNullable.undefined(), JsonNullable.undefined(), JsonNullable.undefined(), JsonNullable.undefined(), Optional.empty(), Optional.empty(), Optional.empty());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> enabled() {
-        return (JsonNullable<Boolean>) enabled;
+        return enabled;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> maxAllowedMemberships() {
-        return (JsonNullable<Long>) maxAllowedMemberships;
+        return maxAllowedMemberships;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> adminDeleteEnabled() {
-        return (JsonNullable<Boolean>) adminDeleteEnabled;
+        return adminDeleteEnabled;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> domainsEnabled() {
-        return (JsonNullable<Boolean>) domainsEnabled;
+        return domainsEnabled;
     }
 
     /**
@@ -118,26 +117,24 @@ public JsonNullable<Boolean> domainsEnabled() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> domainsEnrollmentModes() {
-        return (Optional<java.util.List<String>>) domainsEnrollmentModes;
+    public Optional<List<String>> domainsEnrollmentModes() {
+        return (Optional<List<String>>) domainsEnrollmentModes;
     }
 
     /**
      * Specify what the default organization role is for an organization creator.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> creatorRoleId() {
-        return (Optional<String>) creatorRoleId;
+        return creatorRoleId;
     }
 
     /**
      * Specify what the default organization role is for the organization domains.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> domainsDefaultRoleId() {
-        return (Optional<String>) domainsDefaultRoleId;
+        return domainsDefaultRoleId;
     }
 
     public final static Builder builder() {
@@ -150,7 +147,7 @@ public UpdateInstanceOrganizationSettingsRequestBody withEnabled(boolean enabled
         return this;
     }
 
-    public UpdateInstanceOrganizationSettingsRequestBody withEnabled(JsonNullable<? extends Boolean> enabled) {
+    public UpdateInstanceOrganizationSettingsRequestBody withEnabled(JsonNullable<Boolean> enabled) {
         Utils.checkNotNull(enabled, "enabled");
         this.enabled = enabled;
         return this;
@@ -162,7 +159,7 @@ public UpdateInstanceOrganizationSettingsRequestBody withMaxAllowedMemberships(l
         return this;
     }
 
-    public UpdateInstanceOrganizationSettingsRequestBody withMaxAllowedMemberships(JsonNullable<? extends Long> maxAllowedMemberships) {
+    public UpdateInstanceOrganizationSettingsRequestBody withMaxAllowedMemberships(JsonNullable<Long> maxAllowedMemberships) {
         Utils.checkNotNull(maxAllowedMemberships, "maxAllowedMemberships");
         this.maxAllowedMemberships = maxAllowedMemberships;
         return this;
@@ -174,7 +171,7 @@ public UpdateInstanceOrganizationSettingsRequestBody withAdminDeleteEnabled(bool
         return this;
     }
 
-    public UpdateInstanceOrganizationSettingsRequestBody withAdminDeleteEnabled(JsonNullable<? extends Boolean> adminDeleteEnabled) {
+    public UpdateInstanceOrganizationSettingsRequestBody withAdminDeleteEnabled(JsonNullable<Boolean> adminDeleteEnabled) {
         Utils.checkNotNull(adminDeleteEnabled, "adminDeleteEnabled");
         this.adminDeleteEnabled = adminDeleteEnabled;
         return this;
@@ -186,7 +183,7 @@ public UpdateInstanceOrganizationSettingsRequestBody withDomainsEnabled(boolean
         return this;
     }
 
-    public UpdateInstanceOrganizationSettingsRequestBody withDomainsEnabled(JsonNullable<? extends Boolean> domainsEnabled) {
+    public UpdateInstanceOrganizationSettingsRequestBody withDomainsEnabled(JsonNullable<Boolean> domainsEnabled) {
         Utils.checkNotNull(domainsEnabled, "domainsEnabled");
         this.domainsEnabled = domainsEnabled;
         return this;
@@ -196,7 +193,7 @@ public UpdateInstanceOrganizationSettingsRequestBody withDomainsEnabled(JsonNull
      * Specify which enrollment modes to enable for your Organization Domains.
      * Supported modes are 'automatic_invitation' &amp; 'automatic_suggestion'.
      */
-    public UpdateInstanceOrganizationSettingsRequestBody withDomainsEnrollmentModes(java.util.List<String> domainsEnrollmentModes) {
+    public UpdateInstanceOrganizationSettingsRequestBody withDomainsEnrollmentModes(List<String> domainsEnrollmentModes) {
         Utils.checkNotNull(domainsEnrollmentModes, "domainsEnrollmentModes");
         this.domainsEnrollmentModes = Optional.ofNullable(domainsEnrollmentModes);
         return this;
@@ -206,7 +203,7 @@ public UpdateInstanceOrganizationSettingsRequestBody withDomainsEnrollmentModes(
      * Specify which enrollment modes to enable for your Organization Domains.
      * Supported modes are 'automatic_invitation' &amp; 'automatic_suggestion'.
      */
-    public UpdateInstanceOrganizationSettingsRequestBody withDomainsEnrollmentModes(Optional<? extends java.util.List<String>> domainsEnrollmentModes) {
+    public UpdateInstanceOrganizationSettingsRequestBody withDomainsEnrollmentModes(Optional<? extends List<String>> domainsEnrollmentModes) {
         Utils.checkNotNull(domainsEnrollmentModes, "domainsEnrollmentModes");
         this.domainsEnrollmentModes = domainsEnrollmentModes;
         return this;
@@ -224,7 +221,7 @@ public UpdateInstanceOrganizationSettingsRequestBody withCreatorRoleId(String cr
     /**
      * Specify what the default organization role is for an organization creator.
      */
-    public UpdateInstanceOrganizationSettingsRequestBody withCreatorRoleId(Optional<? extends String> creatorRoleId) {
+    public UpdateInstanceOrganizationSettingsRequestBody withCreatorRoleId(Optional<String> creatorRoleId) {
         Utils.checkNotNull(creatorRoleId, "creatorRoleId");
         this.creatorRoleId = creatorRoleId;
         return this;
@@ -242,7 +239,7 @@ public UpdateInstanceOrganizationSettingsRequestBody withDomainsDefaultRoleId(St
     /**
      * Specify what the default organization role is for the organization domains.
      */
-    public UpdateInstanceOrganizationSettingsRequestBody withDomainsDefaultRoleId(Optional<? extends String> domainsDefaultRoleId) {
+    public UpdateInstanceOrganizationSettingsRequestBody withDomainsDefaultRoleId(Optional<String> domainsDefaultRoleId) {
         Utils.checkNotNull(domainsDefaultRoleId, "domainsDefaultRoleId");
         this.domainsDefaultRoleId = domainsDefaultRoleId;
         return this;
@@ -258,18 +255,18 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateInstanceOrganizationSettingsRequestBody other = (UpdateInstanceOrganizationSettingsRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.enabled, other.enabled) &&
-            java.util.Objects.deepEquals(this.maxAllowedMemberships, other.maxAllowedMemberships) &&
-            java.util.Objects.deepEquals(this.adminDeleteEnabled, other.adminDeleteEnabled) &&
-            java.util.Objects.deepEquals(this.domainsEnabled, other.domainsEnabled) &&
-            java.util.Objects.deepEquals(this.domainsEnrollmentModes, other.domainsEnrollmentModes) &&
-            java.util.Objects.deepEquals(this.creatorRoleId, other.creatorRoleId) &&
-            java.util.Objects.deepEquals(this.domainsDefaultRoleId, other.domainsDefaultRoleId);
+            Objects.deepEquals(this.enabled, other.enabled) &&
+            Objects.deepEquals(this.maxAllowedMemberships, other.maxAllowedMemberships) &&
+            Objects.deepEquals(this.adminDeleteEnabled, other.adminDeleteEnabled) &&
+            Objects.deepEquals(this.domainsEnabled, other.domainsEnabled) &&
+            Objects.deepEquals(this.domainsEnrollmentModes, other.domainsEnrollmentModes) &&
+            Objects.deepEquals(this.creatorRoleId, other.creatorRoleId) &&
+            Objects.deepEquals(this.domainsDefaultRoleId, other.domainsDefaultRoleId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             enabled,
             maxAllowedMemberships,
             adminDeleteEnabled,
@@ -293,19 +290,19 @@ public String toString() {
     
     public final static class Builder {
  
-        private JsonNullable<? extends Boolean> enabled = JsonNullable.undefined();
+        private JsonNullable<Boolean> enabled = JsonNullable.undefined();
  
-        private JsonNullable<? extends Long> maxAllowedMemberships = JsonNullable.undefined();
+        private JsonNullable<Long> maxAllowedMemberships = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> adminDeleteEnabled = JsonNullable.undefined();
+        private JsonNullable<Boolean> adminDeleteEnabled = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> domainsEnabled = JsonNullable.undefined();
+        private JsonNullable<Boolean> domainsEnabled = JsonNullable.undefined();
  
-        private Optional<? extends java.util.List<String>> domainsEnrollmentModes = Optional.empty();
+        private Optional<? extends List<String>> domainsEnrollmentModes = Optional.empty();
  
-        private Optional<? extends String> creatorRoleId = Optional.empty();
+        private Optional<String> creatorRoleId = Optional.empty();
  
-        private Optional<? extends String> domainsDefaultRoleId = Optional.empty();  
+        private Optional<String> domainsDefaultRoleId = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -317,7 +314,7 @@ public Builder enabled(boolean enabled) {
             return this;
         }
 
-        public Builder enabled(JsonNullable<? extends Boolean> enabled) {
+        public Builder enabled(JsonNullable<Boolean> enabled) {
             Utils.checkNotNull(enabled, "enabled");
             this.enabled = enabled;
             return this;
@@ -329,7 +326,7 @@ public Builder maxAllowedMemberships(long maxAllowedMemberships) {
             return this;
         }
 
-        public Builder maxAllowedMemberships(JsonNullable<? extends Long> maxAllowedMemberships) {
+        public Builder maxAllowedMemberships(JsonNullable<Long> maxAllowedMemberships) {
             Utils.checkNotNull(maxAllowedMemberships, "maxAllowedMemberships");
             this.maxAllowedMemberships = maxAllowedMemberships;
             return this;
@@ -341,7 +338,7 @@ public Builder adminDeleteEnabled(boolean adminDeleteEnabled) {
             return this;
         }
 
-        public Builder adminDeleteEnabled(JsonNullable<? extends Boolean> adminDeleteEnabled) {
+        public Builder adminDeleteEnabled(JsonNullable<Boolean> adminDeleteEnabled) {
             Utils.checkNotNull(adminDeleteEnabled, "adminDeleteEnabled");
             this.adminDeleteEnabled = adminDeleteEnabled;
             return this;
@@ -353,7 +350,7 @@ public Builder domainsEnabled(boolean domainsEnabled) {
             return this;
         }
 
-        public Builder domainsEnabled(JsonNullable<? extends Boolean> domainsEnabled) {
+        public Builder domainsEnabled(JsonNullable<Boolean> domainsEnabled) {
             Utils.checkNotNull(domainsEnabled, "domainsEnabled");
             this.domainsEnabled = domainsEnabled;
             return this;
@@ -363,7 +360,7 @@ public Builder domainsEnabled(JsonNullable<? extends Boolean> domainsEnabled) {
          * Specify which enrollment modes to enable for your Organization Domains.
          * Supported modes are 'automatic_invitation' &amp; 'automatic_suggestion'.
          */
-        public Builder domainsEnrollmentModes(java.util.List<String> domainsEnrollmentModes) {
+        public Builder domainsEnrollmentModes(List<String> domainsEnrollmentModes) {
             Utils.checkNotNull(domainsEnrollmentModes, "domainsEnrollmentModes");
             this.domainsEnrollmentModes = Optional.ofNullable(domainsEnrollmentModes);
             return this;
@@ -373,7 +370,7 @@ public Builder domainsEnrollmentModes(java.util.List<String> domainsEnrollmentMo
          * Specify which enrollment modes to enable for your Organization Domains.
          * Supported modes are 'automatic_invitation' &amp; 'automatic_suggestion'.
          */
-        public Builder domainsEnrollmentModes(Optional<? extends java.util.List<String>> domainsEnrollmentModes) {
+        public Builder domainsEnrollmentModes(Optional<? extends List<String>> domainsEnrollmentModes) {
             Utils.checkNotNull(domainsEnrollmentModes, "domainsEnrollmentModes");
             this.domainsEnrollmentModes = domainsEnrollmentModes;
             return this;
@@ -391,7 +388,7 @@ public Builder creatorRoleId(String creatorRoleId) {
         /**
          * Specify what the default organization role is for an organization creator.
          */
-        public Builder creatorRoleId(Optional<? extends String> creatorRoleId) {
+        public Builder creatorRoleId(Optional<String> creatorRoleId) {
             Utils.checkNotNull(creatorRoleId, "creatorRoleId");
             this.creatorRoleId = creatorRoleId;
             return this;
@@ -409,7 +406,7 @@ public Builder domainsDefaultRoleId(String domainsDefaultRoleId) {
         /**
          * Specify what the default organization role is for the organization domains.
          */
-        public Builder domainsDefaultRoleId(Optional<? extends String> domainsDefaultRoleId) {
+        public Builder domainsDefaultRoleId(Optional<String> domainsDefaultRoleId) {
             Utils.checkNotNull(domainsDefaultRoleId, "domainsDefaultRoleId");
             this.domainsDefaultRoleId = domainsDefaultRoleId;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceOrganizationSettingsRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceOrganizationSettingsRequestBuilder.java
index 449063b..08354f8 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceOrganizationSettingsRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceOrganizationSettingsRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class UpdateInstanceOrganizationSettingsRequestBuilder {
 
@@ -26,13 +16,13 @@ public UpdateInstanceOrganizationSettingsRequestBuilder(SDKMethodInterfaces.Meth
         this.sdk = sdk;
     }
                 
-    public UpdateInstanceOrganizationSettingsRequestBuilder request(UpdateInstanceOrganizationSettingsRequestBody request) {
+    public UpdateInstanceOrganizationSettingsRequestBuilder request(com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public UpdateInstanceOrganizationSettingsRequestBuilder request(Optional<? extends UpdateInstanceOrganizationSettingsRequestBody> request) {
+    public UpdateInstanceOrganizationSettingsRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceOrganizationSettingsRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceOrganizationSettingsResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceOrganizationSettingsResponse.java
index 61e3bb6..b808321 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceOrganizationSettingsResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceOrganizationSettingsResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OrganizationSettings;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdateInstanceOrganizationSettingsResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdateInstanceOrganizationSettingsResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdateInstanceOrganizationSettingsResponse implements com.clerk.bac
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OrganizationSettings> organizationSettings;
+    private Optional<? extends OrganizationSettings> organizationSettings;
 
     @JsonCreator
     public UpdateInstanceOrganizationSettingsResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OrganizationSettings> organizationSettings) {
+            Optional<? extends OrganizationSettings> organizationSettings) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OrganizationSettings> organizationSettings() {
-        return (Optional<com.clerk.backend_api.models.components.OrganizationSettings>) organizationSettings;
+    public Optional<OrganizationSettings> organizationSettings() {
+        return (Optional<OrganizationSettings>) organizationSettings;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdateInstanceOrganizationSettingsResponse withRawResponse(HttpResponse<I
     /**
      * Success
      */
-    public UpdateInstanceOrganizationSettingsResponse withOrganizationSettings(com.clerk.backend_api.models.components.OrganizationSettings organizationSettings) {
+    public UpdateInstanceOrganizationSettingsResponse withOrganizationSettings(OrganizationSettings organizationSettings) {
         Utils.checkNotNull(organizationSettings, "organizationSettings");
         this.organizationSettings = Optional.ofNullable(organizationSettings);
         return this;
@@ -137,7 +141,7 @@ public UpdateInstanceOrganizationSettingsResponse withOrganizationSettings(com.c
     /**
      * Success
      */
-    public UpdateInstanceOrganizationSettingsResponse withOrganizationSettings(Optional<? extends com.clerk.backend_api.models.components.OrganizationSettings> organizationSettings) {
+    public UpdateInstanceOrganizationSettingsResponse withOrganizationSettings(Optional<? extends OrganizationSettings> organizationSettings) {
         Utils.checkNotNull(organizationSettings, "organizationSettings");
         this.organizationSettings = organizationSettings;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateInstanceOrganizationSettingsResponse other = (UpdateInstanceOrganizationSettingsResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizationSettings, other.organizationSettings);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizationSettings, other.organizationSettings);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OrganizationSettings> organizationSettings = Optional.empty();  
+        private Optional<? extends OrganizationSettings> organizationSettings = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder organizationSettings(com.clerk.backend_api.models.components.OrganizationSettings organizationSettings) {
+        public Builder organizationSettings(OrganizationSettings organizationSettings) {
             Utils.checkNotNull(organizationSettings, "organizationSettings");
             this.organizationSettings = Optional.ofNullable(organizationSettings);
             return this;
@@ -230,7 +234,7 @@ public Builder organizationSettings(com.clerk.backend_api.models.components.Orga
         /**
          * Success
          */
-        public Builder organizationSettings(Optional<? extends com.clerk.backend_api.models.components.OrganizationSettings> organizationSettings) {
+        public Builder organizationSettings(Optional<? extends OrganizationSettings> organizationSettings) {
             Utils.checkNotNull(organizationSettings, "organizationSettings");
             this.organizationSettings = organizationSettings;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRequestBody.java
index d2ad785..2659bd6 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRequestBody.java
@@ -4,21 +4,24 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
+import java.lang.Boolean;
 import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class UpdateInstanceRequestBody {
 
     /**
@@ -27,14 +30,14 @@ public class UpdateInstanceRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("test_mode")
-    private JsonNullable<? extends Boolean> testMode;
+    private JsonNullable<Boolean> testMode;
 
     /**
      * Whether the instance should be using the HIBP service to check passwords for breaches
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("hibp")
-    private JsonNullable<? extends Boolean> hibp;
+    private JsonNullable<Boolean> hibp;
 
     /**
      * The "enhanced_email_deliverability" feature will send emails from "verifications@clerk.dev" instead of your domain.
@@ -42,19 +45,19 @@ public class UpdateInstanceRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("enhanced_email_deliverability")
-    private JsonNullable<? extends Boolean> enhancedEmailDeliverability;
+    private JsonNullable<Boolean> enhancedEmailDeliverability;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("support_email")
-    private JsonNullable<? extends String> supportEmail;
+    private JsonNullable<String> supportEmail;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("clerk_js_version")
-    private JsonNullable<? extends String> clerkJsVersion;
+    private JsonNullable<String> clerkJsVersion;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("development_origin")
-    private JsonNullable<? extends String> developmentOrigin;
+    private JsonNullable<String> developmentOrigin;
 
     /**
      * For browser-like stacks such as browser extensions, Electron, or Capacitor.js the instance allowed origins need to be updated with the request origin value.
@@ -62,7 +65,7 @@ public class UpdateInstanceRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("allowed_origins")
-    private Optional<? extends java.util.List<String>> allowedOrigins;
+    private Optional<? extends List<String>> allowedOrigins;
 
     /**
      * Whether the instance should operate in cookieless development mode (i.e. without third-party cookies).
@@ -72,26 +75,26 @@ public class UpdateInstanceRequestBody {
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("cookieless_dev")
     @Deprecated
-    private Optional<? extends Boolean> cookielessDev;
+    private Optional<Boolean> cookielessDev;
 
     /**
      * Whether the instance should use URL-based session syncing in development mode (i.e. without third-party cookies).
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("url_based_session_syncing")
-    private Optional<? extends Boolean> urlBasedSessionSyncing;
+    private Optional<Boolean> urlBasedSessionSyncing;
 
     @JsonCreator
     public UpdateInstanceRequestBody(
-            @JsonProperty("test_mode") JsonNullable<? extends Boolean> testMode,
-            @JsonProperty("hibp") JsonNullable<? extends Boolean> hibp,
-            @JsonProperty("enhanced_email_deliverability") JsonNullable<? extends Boolean> enhancedEmailDeliverability,
-            @JsonProperty("support_email") JsonNullable<? extends String> supportEmail,
-            @JsonProperty("clerk_js_version") JsonNullable<? extends String> clerkJsVersion,
-            @JsonProperty("development_origin") JsonNullable<? extends String> developmentOrigin,
-            @JsonProperty("allowed_origins") Optional<? extends java.util.List<String>> allowedOrigins,
-            @JsonProperty("cookieless_dev") Optional<? extends Boolean> cookielessDev,
-            @JsonProperty("url_based_session_syncing") Optional<? extends Boolean> urlBasedSessionSyncing) {
+            @JsonProperty("test_mode") JsonNullable<Boolean> testMode,
+            @JsonProperty("hibp") JsonNullable<Boolean> hibp,
+            @JsonProperty("enhanced_email_deliverability") JsonNullable<Boolean> enhancedEmailDeliverability,
+            @JsonProperty("support_email") JsonNullable<String> supportEmail,
+            @JsonProperty("clerk_js_version") JsonNullable<String> clerkJsVersion,
+            @JsonProperty("development_origin") JsonNullable<String> developmentOrigin,
+            @JsonProperty("allowed_origins") Optional<? extends List<String>> allowedOrigins,
+            @JsonProperty("cookieless_dev") Optional<Boolean> cookielessDev,
+            @JsonProperty("url_based_session_syncing") Optional<Boolean> urlBasedSessionSyncing) {
         Utils.checkNotNull(testMode, "testMode");
         Utils.checkNotNull(hibp, "hibp");
         Utils.checkNotNull(enhancedEmailDeliverability, "enhancedEmailDeliverability");
@@ -120,47 +123,41 @@ public UpdateInstanceRequestBody() {
      * Toggles test mode for this instance, allowing the use of test email addresses and phone numbers.
      * Defaults to true for development instances.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> testMode() {
-        return (JsonNullable<Boolean>) testMode;
+        return testMode;
     }
 
     /**
      * Whether the instance should be using the HIBP service to check passwords for breaches
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> hibp() {
-        return (JsonNullable<Boolean>) hibp;
+        return hibp;
     }
 
     /**
      * The "enhanced_email_deliverability" feature will send emails from "verifications@clerk.dev" instead of your domain.
      * This can be helpful if you do not have a high domain reputation.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> enhancedEmailDeliverability() {
-        return (JsonNullable<Boolean>) enhancedEmailDeliverability;
+        return enhancedEmailDeliverability;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> supportEmail() {
-        return (JsonNullable<String>) supportEmail;
+        return supportEmail;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> clerkJsVersion() {
-        return (JsonNullable<String>) clerkJsVersion;
+        return clerkJsVersion;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> developmentOrigin() {
-        return (JsonNullable<String>) developmentOrigin;
+        return developmentOrigin;
     }
 
     /**
@@ -169,8 +166,8 @@ public JsonNullable<String> developmentOrigin() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> allowedOrigins() {
-        return (Optional<java.util.List<String>>) allowedOrigins;
+    public Optional<List<String>> allowedOrigins() {
+        return (Optional<List<String>>) allowedOrigins;
     }
 
     /**
@@ -179,19 +176,17 @@ public Optional<java.util.List<String>> allowedOrigins() {
      * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> cookielessDev() {
-        return (Optional<Boolean>) cookielessDev;
+        return cookielessDev;
     }
 
     /**
      * Whether the instance should use URL-based session syncing in development mode (i.e. without third-party cookies).
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> urlBasedSessionSyncing() {
-        return (Optional<Boolean>) urlBasedSessionSyncing;
+        return urlBasedSessionSyncing;
     }
 
     public final static Builder builder() {
@@ -212,7 +207,7 @@ public UpdateInstanceRequestBody withTestMode(boolean testMode) {
      * Toggles test mode for this instance, allowing the use of test email addresses and phone numbers.
      * Defaults to true for development instances.
      */
-    public UpdateInstanceRequestBody withTestMode(JsonNullable<? extends Boolean> testMode) {
+    public UpdateInstanceRequestBody withTestMode(JsonNullable<Boolean> testMode) {
         Utils.checkNotNull(testMode, "testMode");
         this.testMode = testMode;
         return this;
@@ -230,7 +225,7 @@ public UpdateInstanceRequestBody withHibp(boolean hibp) {
     /**
      * Whether the instance should be using the HIBP service to check passwords for breaches
      */
-    public UpdateInstanceRequestBody withHibp(JsonNullable<? extends Boolean> hibp) {
+    public UpdateInstanceRequestBody withHibp(JsonNullable<Boolean> hibp) {
         Utils.checkNotNull(hibp, "hibp");
         this.hibp = hibp;
         return this;
@@ -250,7 +245,7 @@ public UpdateInstanceRequestBody withEnhancedEmailDeliverability(boolean enhance
      * The "enhanced_email_deliverability" feature will send emails from "verifications@clerk.dev" instead of your domain.
      * This can be helpful if you do not have a high domain reputation.
      */
-    public UpdateInstanceRequestBody withEnhancedEmailDeliverability(JsonNullable<? extends Boolean> enhancedEmailDeliverability) {
+    public UpdateInstanceRequestBody withEnhancedEmailDeliverability(JsonNullable<Boolean> enhancedEmailDeliverability) {
         Utils.checkNotNull(enhancedEmailDeliverability, "enhancedEmailDeliverability");
         this.enhancedEmailDeliverability = enhancedEmailDeliverability;
         return this;
@@ -262,7 +257,7 @@ public UpdateInstanceRequestBody withSupportEmail(String supportEmail) {
         return this;
     }
 
-    public UpdateInstanceRequestBody withSupportEmail(JsonNullable<? extends String> supportEmail) {
+    public UpdateInstanceRequestBody withSupportEmail(JsonNullable<String> supportEmail) {
         Utils.checkNotNull(supportEmail, "supportEmail");
         this.supportEmail = supportEmail;
         return this;
@@ -274,7 +269,7 @@ public UpdateInstanceRequestBody withClerkJsVersion(String clerkJsVersion) {
         return this;
     }
 
-    public UpdateInstanceRequestBody withClerkJsVersion(JsonNullable<? extends String> clerkJsVersion) {
+    public UpdateInstanceRequestBody withClerkJsVersion(JsonNullable<String> clerkJsVersion) {
         Utils.checkNotNull(clerkJsVersion, "clerkJsVersion");
         this.clerkJsVersion = clerkJsVersion;
         return this;
@@ -286,7 +281,7 @@ public UpdateInstanceRequestBody withDevelopmentOrigin(String developmentOrigin)
         return this;
     }
 
-    public UpdateInstanceRequestBody withDevelopmentOrigin(JsonNullable<? extends String> developmentOrigin) {
+    public UpdateInstanceRequestBody withDevelopmentOrigin(JsonNullable<String> developmentOrigin) {
         Utils.checkNotNull(developmentOrigin, "developmentOrigin");
         this.developmentOrigin = developmentOrigin;
         return this;
@@ -296,7 +291,7 @@ public UpdateInstanceRequestBody withDevelopmentOrigin(JsonNullable<? extends St
      * For browser-like stacks such as browser extensions, Electron, or Capacitor.js the instance allowed origins need to be updated with the request origin value.
      * For Chrome extensions popup, background, or service worker pages the origin is chrome-extension://extension_uiid. For Electron apps the default origin is http://localhost:3000. For Capacitor, the origin is capacitor://localhost.
      */
-    public UpdateInstanceRequestBody withAllowedOrigins(java.util.List<String> allowedOrigins) {
+    public UpdateInstanceRequestBody withAllowedOrigins(List<String> allowedOrigins) {
         Utils.checkNotNull(allowedOrigins, "allowedOrigins");
         this.allowedOrigins = Optional.ofNullable(allowedOrigins);
         return this;
@@ -306,7 +301,7 @@ public UpdateInstanceRequestBody withAllowedOrigins(java.util.List<String> allow
      * For browser-like stacks such as browser extensions, Electron, or Capacitor.js the instance allowed origins need to be updated with the request origin value.
      * For Chrome extensions popup, background, or service worker pages the origin is chrome-extension://extension_uiid. For Electron apps the default origin is http://localhost:3000. For Capacitor, the origin is capacitor://localhost.
      */
-    public UpdateInstanceRequestBody withAllowedOrigins(Optional<? extends java.util.List<String>> allowedOrigins) {
+    public UpdateInstanceRequestBody withAllowedOrigins(Optional<? extends List<String>> allowedOrigins) {
         Utils.checkNotNull(allowedOrigins, "allowedOrigins");
         this.allowedOrigins = allowedOrigins;
         return this;
@@ -330,7 +325,7 @@ public UpdateInstanceRequestBody withCookielessDev(boolean cookielessDev) {
      * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
      */
     @Deprecated
-    public UpdateInstanceRequestBody withCookielessDev(Optional<? extends Boolean> cookielessDev) {
+    public UpdateInstanceRequestBody withCookielessDev(Optional<Boolean> cookielessDev) {
         Utils.checkNotNull(cookielessDev, "cookielessDev");
         this.cookielessDev = cookielessDev;
         return this;
@@ -348,7 +343,7 @@ public UpdateInstanceRequestBody withUrlBasedSessionSyncing(boolean urlBasedSess
     /**
      * Whether the instance should use URL-based session syncing in development mode (i.e. without third-party cookies).
      */
-    public UpdateInstanceRequestBody withUrlBasedSessionSyncing(Optional<? extends Boolean> urlBasedSessionSyncing) {
+    public UpdateInstanceRequestBody withUrlBasedSessionSyncing(Optional<Boolean> urlBasedSessionSyncing) {
         Utils.checkNotNull(urlBasedSessionSyncing, "urlBasedSessionSyncing");
         this.urlBasedSessionSyncing = urlBasedSessionSyncing;
         return this;
@@ -364,20 +359,20 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateInstanceRequestBody other = (UpdateInstanceRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.testMode, other.testMode) &&
-            java.util.Objects.deepEquals(this.hibp, other.hibp) &&
-            java.util.Objects.deepEquals(this.enhancedEmailDeliverability, other.enhancedEmailDeliverability) &&
-            java.util.Objects.deepEquals(this.supportEmail, other.supportEmail) &&
-            java.util.Objects.deepEquals(this.clerkJsVersion, other.clerkJsVersion) &&
-            java.util.Objects.deepEquals(this.developmentOrigin, other.developmentOrigin) &&
-            java.util.Objects.deepEquals(this.allowedOrigins, other.allowedOrigins) &&
-            java.util.Objects.deepEquals(this.cookielessDev, other.cookielessDev) &&
-            java.util.Objects.deepEquals(this.urlBasedSessionSyncing, other.urlBasedSessionSyncing);
+            Objects.deepEquals(this.testMode, other.testMode) &&
+            Objects.deepEquals(this.hibp, other.hibp) &&
+            Objects.deepEquals(this.enhancedEmailDeliverability, other.enhancedEmailDeliverability) &&
+            Objects.deepEquals(this.supportEmail, other.supportEmail) &&
+            Objects.deepEquals(this.clerkJsVersion, other.clerkJsVersion) &&
+            Objects.deepEquals(this.developmentOrigin, other.developmentOrigin) &&
+            Objects.deepEquals(this.allowedOrigins, other.allowedOrigins) &&
+            Objects.deepEquals(this.cookielessDev, other.cookielessDev) &&
+            Objects.deepEquals(this.urlBasedSessionSyncing, other.urlBasedSessionSyncing);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             testMode,
             hibp,
             enhancedEmailDeliverability,
@@ -405,24 +400,24 @@ public String toString() {
     
     public final static class Builder {
  
-        private JsonNullable<? extends Boolean> testMode = JsonNullable.undefined();
+        private JsonNullable<Boolean> testMode = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> hibp = JsonNullable.undefined();
+        private JsonNullable<Boolean> hibp = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> enhancedEmailDeliverability = JsonNullable.undefined();
+        private JsonNullable<Boolean> enhancedEmailDeliverability = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> supportEmail = JsonNullable.undefined();
+        private JsonNullable<String> supportEmail = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> clerkJsVersion = JsonNullable.undefined();
+        private JsonNullable<String> clerkJsVersion = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> developmentOrigin = JsonNullable.undefined();
+        private JsonNullable<String> developmentOrigin = JsonNullable.undefined();
  
-        private Optional<? extends java.util.List<String>> allowedOrigins = Optional.empty();
+        private Optional<? extends List<String>> allowedOrigins = Optional.empty();
  
         @Deprecated
-        private Optional<? extends Boolean> cookielessDev = Optional.empty();
+        private Optional<Boolean> cookielessDev = Optional.empty();
  
-        private Optional<? extends Boolean> urlBasedSessionSyncing = Optional.empty();  
+        private Optional<Boolean> urlBasedSessionSyncing = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -442,7 +437,7 @@ public Builder testMode(boolean testMode) {
          * Toggles test mode for this instance, allowing the use of test email addresses and phone numbers.
          * Defaults to true for development instances.
          */
-        public Builder testMode(JsonNullable<? extends Boolean> testMode) {
+        public Builder testMode(JsonNullable<Boolean> testMode) {
             Utils.checkNotNull(testMode, "testMode");
             this.testMode = testMode;
             return this;
@@ -460,7 +455,7 @@ public Builder hibp(boolean hibp) {
         /**
          * Whether the instance should be using the HIBP service to check passwords for breaches
          */
-        public Builder hibp(JsonNullable<? extends Boolean> hibp) {
+        public Builder hibp(JsonNullable<Boolean> hibp) {
             Utils.checkNotNull(hibp, "hibp");
             this.hibp = hibp;
             return this;
@@ -480,7 +475,7 @@ public Builder enhancedEmailDeliverability(boolean enhancedEmailDeliverability)
          * The "enhanced_email_deliverability" feature will send emails from "verifications@clerk.dev" instead of your domain.
          * This can be helpful if you do not have a high domain reputation.
          */
-        public Builder enhancedEmailDeliverability(JsonNullable<? extends Boolean> enhancedEmailDeliverability) {
+        public Builder enhancedEmailDeliverability(JsonNullable<Boolean> enhancedEmailDeliverability) {
             Utils.checkNotNull(enhancedEmailDeliverability, "enhancedEmailDeliverability");
             this.enhancedEmailDeliverability = enhancedEmailDeliverability;
             return this;
@@ -492,7 +487,7 @@ public Builder supportEmail(String supportEmail) {
             return this;
         }
 
-        public Builder supportEmail(JsonNullable<? extends String> supportEmail) {
+        public Builder supportEmail(JsonNullable<String> supportEmail) {
             Utils.checkNotNull(supportEmail, "supportEmail");
             this.supportEmail = supportEmail;
             return this;
@@ -504,7 +499,7 @@ public Builder clerkJsVersion(String clerkJsVersion) {
             return this;
         }
 
-        public Builder clerkJsVersion(JsonNullable<? extends String> clerkJsVersion) {
+        public Builder clerkJsVersion(JsonNullable<String> clerkJsVersion) {
             Utils.checkNotNull(clerkJsVersion, "clerkJsVersion");
             this.clerkJsVersion = clerkJsVersion;
             return this;
@@ -516,7 +511,7 @@ public Builder developmentOrigin(String developmentOrigin) {
             return this;
         }
 
-        public Builder developmentOrigin(JsonNullable<? extends String> developmentOrigin) {
+        public Builder developmentOrigin(JsonNullable<String> developmentOrigin) {
             Utils.checkNotNull(developmentOrigin, "developmentOrigin");
             this.developmentOrigin = developmentOrigin;
             return this;
@@ -526,7 +521,7 @@ public Builder developmentOrigin(JsonNullable<? extends String> developmentOrigi
          * For browser-like stacks such as browser extensions, Electron, or Capacitor.js the instance allowed origins need to be updated with the request origin value.
          * For Chrome extensions popup, background, or service worker pages the origin is chrome-extension://extension_uiid. For Electron apps the default origin is http://localhost:3000. For Capacitor, the origin is capacitor://localhost.
          */
-        public Builder allowedOrigins(java.util.List<String> allowedOrigins) {
+        public Builder allowedOrigins(List<String> allowedOrigins) {
             Utils.checkNotNull(allowedOrigins, "allowedOrigins");
             this.allowedOrigins = Optional.ofNullable(allowedOrigins);
             return this;
@@ -536,7 +531,7 @@ public Builder allowedOrigins(java.util.List<String> allowedOrigins) {
          * For browser-like stacks such as browser extensions, Electron, or Capacitor.js the instance allowed origins need to be updated with the request origin value.
          * For Chrome extensions popup, background, or service worker pages the origin is chrome-extension://extension_uiid. For Electron apps the default origin is http://localhost:3000. For Capacitor, the origin is capacitor://localhost.
          */
-        public Builder allowedOrigins(Optional<? extends java.util.List<String>> allowedOrigins) {
+        public Builder allowedOrigins(Optional<? extends List<String>> allowedOrigins) {
             Utils.checkNotNull(allowedOrigins, "allowedOrigins");
             this.allowedOrigins = allowedOrigins;
             return this;
@@ -560,7 +555,7 @@ public Builder cookielessDev(boolean cookielessDev) {
          * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
          */
         @Deprecated
-        public Builder cookielessDev(Optional<? extends Boolean> cookielessDev) {
+        public Builder cookielessDev(Optional<Boolean> cookielessDev) {
             Utils.checkNotNull(cookielessDev, "cookielessDev");
             this.cookielessDev = cookielessDev;
             return this;
@@ -578,7 +573,7 @@ public Builder urlBasedSessionSyncing(boolean urlBasedSessionSyncing) {
         /**
          * Whether the instance should use URL-based session syncing in development mode (i.e. without third-party cookies).
          */
-        public Builder urlBasedSessionSyncing(Optional<? extends Boolean> urlBasedSessionSyncing) {
+        public Builder urlBasedSessionSyncing(Optional<Boolean> urlBasedSessionSyncing) {
             Utils.checkNotNull(urlBasedSessionSyncing, "urlBasedSessionSyncing");
             this.urlBasedSessionSyncing = urlBasedSessionSyncing;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRequestBuilder.java
index 3080fc1..cf94ef8 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class UpdateInstanceRequestBuilder {
 
@@ -26,13 +16,13 @@ public UpdateInstanceRequestBuilder(SDKMethodInterfaces.MethodCallUpdateInstance
         this.sdk = sdk;
     }
                 
-    public UpdateInstanceRequestBuilder request(UpdateInstanceRequestBody request) {
+    public UpdateInstanceRequestBuilder request(com.clerk.backend_api.models.operations.UpdateInstanceRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public UpdateInstanceRequestBuilder request(Optional<? extends UpdateInstanceRequestBody> request) {
+    public UpdateInstanceRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceResponse.java
index ca74c0f..4430da7 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceResponse.java
@@ -4,18 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
 import java.net.http.HttpResponse;
+import java.util.Objects;
+
 
-public class UpdateInstanceResponse implements com.clerk.backend_api.utils.Response {
+public class UpdateInstanceResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -110,14 +112,14 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateInstanceResponse other = (UpdateInstanceResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse);
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRestrictionsRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRestrictionsRequestBody.java
index d76c5f4..3eddd96 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRestrictionsRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRestrictionsRequestBody.java
@@ -4,49 +4,49 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class UpdateInstanceRestrictionsRequestBody {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("allowlist")
-    private JsonNullable<? extends Boolean> allowlist;
+    private JsonNullable<Boolean> allowlist;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("blocklist")
-    private JsonNullable<? extends Boolean> blocklist;
+    private JsonNullable<Boolean> blocklist;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("block_email_subaddresses")
-    private JsonNullable<? extends Boolean> blockEmailSubaddresses;
+    private JsonNullable<Boolean> blockEmailSubaddresses;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("block_disposable_email_domains")
-    private JsonNullable<? extends Boolean> blockDisposableEmailDomains;
+    private JsonNullable<Boolean> blockDisposableEmailDomains;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("ignore_dots_for_gmail_addresses")
-    private JsonNullable<? extends Boolean> ignoreDotsForGmailAddresses;
+    private JsonNullable<Boolean> ignoreDotsForGmailAddresses;
 
     @JsonCreator
     public UpdateInstanceRestrictionsRequestBody(
-            @JsonProperty("allowlist") JsonNullable<? extends Boolean> allowlist,
-            @JsonProperty("blocklist") JsonNullable<? extends Boolean> blocklist,
-            @JsonProperty("block_email_subaddresses") JsonNullable<? extends Boolean> blockEmailSubaddresses,
-            @JsonProperty("block_disposable_email_domains") JsonNullable<? extends Boolean> blockDisposableEmailDomains,
-            @JsonProperty("ignore_dots_for_gmail_addresses") JsonNullable<? extends Boolean> ignoreDotsForGmailAddresses) {
+            @JsonProperty("allowlist") JsonNullable<Boolean> allowlist,
+            @JsonProperty("blocklist") JsonNullable<Boolean> blocklist,
+            @JsonProperty("block_email_subaddresses") JsonNullable<Boolean> blockEmailSubaddresses,
+            @JsonProperty("block_disposable_email_domains") JsonNullable<Boolean> blockDisposableEmailDomains,
+            @JsonProperty("ignore_dots_for_gmail_addresses") JsonNullable<Boolean> ignoreDotsForGmailAddresses) {
         Utils.checkNotNull(allowlist, "allowlist");
         Utils.checkNotNull(blocklist, "blocklist");
         Utils.checkNotNull(blockEmailSubaddresses, "blockEmailSubaddresses");
@@ -63,34 +63,29 @@ public UpdateInstanceRestrictionsRequestBody() {
         this(JsonNullable.undefined(), JsonNullable.undefined(), JsonNullable.undefined(), JsonNullable.undefined(), JsonNullable.undefined());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> allowlist() {
-        return (JsonNullable<Boolean>) allowlist;
+        return allowlist;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> blocklist() {
-        return (JsonNullable<Boolean>) blocklist;
+        return blocklist;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> blockEmailSubaddresses() {
-        return (JsonNullable<Boolean>) blockEmailSubaddresses;
+        return blockEmailSubaddresses;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> blockDisposableEmailDomains() {
-        return (JsonNullable<Boolean>) blockDisposableEmailDomains;
+        return blockDisposableEmailDomains;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> ignoreDotsForGmailAddresses() {
-        return (JsonNullable<Boolean>) ignoreDotsForGmailAddresses;
+        return ignoreDotsForGmailAddresses;
     }
 
     public final static Builder builder() {
@@ -103,7 +98,7 @@ public UpdateInstanceRestrictionsRequestBody withAllowlist(boolean allowlist) {
         return this;
     }
 
-    public UpdateInstanceRestrictionsRequestBody withAllowlist(JsonNullable<? extends Boolean> allowlist) {
+    public UpdateInstanceRestrictionsRequestBody withAllowlist(JsonNullable<Boolean> allowlist) {
         Utils.checkNotNull(allowlist, "allowlist");
         this.allowlist = allowlist;
         return this;
@@ -115,7 +110,7 @@ public UpdateInstanceRestrictionsRequestBody withBlocklist(boolean blocklist) {
         return this;
     }
 
-    public UpdateInstanceRestrictionsRequestBody withBlocklist(JsonNullable<? extends Boolean> blocklist) {
+    public UpdateInstanceRestrictionsRequestBody withBlocklist(JsonNullable<Boolean> blocklist) {
         Utils.checkNotNull(blocklist, "blocklist");
         this.blocklist = blocklist;
         return this;
@@ -127,7 +122,7 @@ public UpdateInstanceRestrictionsRequestBody withBlockEmailSubaddresses(boolean
         return this;
     }
 
-    public UpdateInstanceRestrictionsRequestBody withBlockEmailSubaddresses(JsonNullable<? extends Boolean> blockEmailSubaddresses) {
+    public UpdateInstanceRestrictionsRequestBody withBlockEmailSubaddresses(JsonNullable<Boolean> blockEmailSubaddresses) {
         Utils.checkNotNull(blockEmailSubaddresses, "blockEmailSubaddresses");
         this.blockEmailSubaddresses = blockEmailSubaddresses;
         return this;
@@ -139,7 +134,7 @@ public UpdateInstanceRestrictionsRequestBody withBlockDisposableEmailDomains(boo
         return this;
     }
 
-    public UpdateInstanceRestrictionsRequestBody withBlockDisposableEmailDomains(JsonNullable<? extends Boolean> blockDisposableEmailDomains) {
+    public UpdateInstanceRestrictionsRequestBody withBlockDisposableEmailDomains(JsonNullable<Boolean> blockDisposableEmailDomains) {
         Utils.checkNotNull(blockDisposableEmailDomains, "blockDisposableEmailDomains");
         this.blockDisposableEmailDomains = blockDisposableEmailDomains;
         return this;
@@ -151,7 +146,7 @@ public UpdateInstanceRestrictionsRequestBody withIgnoreDotsForGmailAddresses(boo
         return this;
     }
 
-    public UpdateInstanceRestrictionsRequestBody withIgnoreDotsForGmailAddresses(JsonNullable<? extends Boolean> ignoreDotsForGmailAddresses) {
+    public UpdateInstanceRestrictionsRequestBody withIgnoreDotsForGmailAddresses(JsonNullable<Boolean> ignoreDotsForGmailAddresses) {
         Utils.checkNotNull(ignoreDotsForGmailAddresses, "ignoreDotsForGmailAddresses");
         this.ignoreDotsForGmailAddresses = ignoreDotsForGmailAddresses;
         return this;
@@ -167,16 +162,16 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateInstanceRestrictionsRequestBody other = (UpdateInstanceRestrictionsRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.allowlist, other.allowlist) &&
-            java.util.Objects.deepEquals(this.blocklist, other.blocklist) &&
-            java.util.Objects.deepEquals(this.blockEmailSubaddresses, other.blockEmailSubaddresses) &&
-            java.util.Objects.deepEquals(this.blockDisposableEmailDomains, other.blockDisposableEmailDomains) &&
-            java.util.Objects.deepEquals(this.ignoreDotsForGmailAddresses, other.ignoreDotsForGmailAddresses);
+            Objects.deepEquals(this.allowlist, other.allowlist) &&
+            Objects.deepEquals(this.blocklist, other.blocklist) &&
+            Objects.deepEquals(this.blockEmailSubaddresses, other.blockEmailSubaddresses) &&
+            Objects.deepEquals(this.blockDisposableEmailDomains, other.blockDisposableEmailDomains) &&
+            Objects.deepEquals(this.ignoreDotsForGmailAddresses, other.ignoreDotsForGmailAddresses);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             allowlist,
             blocklist,
             blockEmailSubaddresses,
@@ -196,15 +191,15 @@ public String toString() {
     
     public final static class Builder {
  
-        private JsonNullable<? extends Boolean> allowlist = JsonNullable.undefined();
+        private JsonNullable<Boolean> allowlist = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> blocklist = JsonNullable.undefined();
+        private JsonNullable<Boolean> blocklist = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> blockEmailSubaddresses = JsonNullable.undefined();
+        private JsonNullable<Boolean> blockEmailSubaddresses = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> blockDisposableEmailDomains = JsonNullable.undefined();
+        private JsonNullable<Boolean> blockDisposableEmailDomains = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> ignoreDotsForGmailAddresses = JsonNullable.undefined();  
+        private JsonNullable<Boolean> ignoreDotsForGmailAddresses = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -216,7 +211,7 @@ public Builder allowlist(boolean allowlist) {
             return this;
         }
 
-        public Builder allowlist(JsonNullable<? extends Boolean> allowlist) {
+        public Builder allowlist(JsonNullable<Boolean> allowlist) {
             Utils.checkNotNull(allowlist, "allowlist");
             this.allowlist = allowlist;
             return this;
@@ -228,7 +223,7 @@ public Builder blocklist(boolean blocklist) {
             return this;
         }
 
-        public Builder blocklist(JsonNullable<? extends Boolean> blocklist) {
+        public Builder blocklist(JsonNullable<Boolean> blocklist) {
             Utils.checkNotNull(blocklist, "blocklist");
             this.blocklist = blocklist;
             return this;
@@ -240,7 +235,7 @@ public Builder blockEmailSubaddresses(boolean blockEmailSubaddresses) {
             return this;
         }
 
-        public Builder blockEmailSubaddresses(JsonNullable<? extends Boolean> blockEmailSubaddresses) {
+        public Builder blockEmailSubaddresses(JsonNullable<Boolean> blockEmailSubaddresses) {
             Utils.checkNotNull(blockEmailSubaddresses, "blockEmailSubaddresses");
             this.blockEmailSubaddresses = blockEmailSubaddresses;
             return this;
@@ -252,7 +247,7 @@ public Builder blockDisposableEmailDomains(boolean blockDisposableEmailDomains)
             return this;
         }
 
-        public Builder blockDisposableEmailDomains(JsonNullable<? extends Boolean> blockDisposableEmailDomains) {
+        public Builder blockDisposableEmailDomains(JsonNullable<Boolean> blockDisposableEmailDomains) {
             Utils.checkNotNull(blockDisposableEmailDomains, "blockDisposableEmailDomains");
             this.blockDisposableEmailDomains = blockDisposableEmailDomains;
             return this;
@@ -264,7 +259,7 @@ public Builder ignoreDotsForGmailAddresses(boolean ignoreDotsForGmailAddresses)
             return this;
         }
 
-        public Builder ignoreDotsForGmailAddresses(JsonNullable<? extends Boolean> ignoreDotsForGmailAddresses) {
+        public Builder ignoreDotsForGmailAddresses(JsonNullable<Boolean> ignoreDotsForGmailAddresses) {
             Utils.checkNotNull(ignoreDotsForGmailAddresses, "ignoreDotsForGmailAddresses");
             this.ignoreDotsForGmailAddresses = ignoreDotsForGmailAddresses;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRestrictionsRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRestrictionsRequestBuilder.java
index 65aa260..0f49df8 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRestrictionsRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRestrictionsRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class UpdateInstanceRestrictionsRequestBuilder {
 
@@ -26,13 +16,13 @@ public UpdateInstanceRestrictionsRequestBuilder(SDKMethodInterfaces.MethodCallUp
         this.sdk = sdk;
     }
                 
-    public UpdateInstanceRestrictionsRequestBuilder request(UpdateInstanceRestrictionsRequestBody request) {
+    public UpdateInstanceRestrictionsRequestBuilder request(com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public UpdateInstanceRestrictionsRequestBuilder request(Optional<? extends UpdateInstanceRestrictionsRequestBody> request) {
+    public UpdateInstanceRestrictionsRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.UpdateInstanceRestrictionsRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRestrictionsResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRestrictionsResponse.java
index 1ef223b..2a42628 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRestrictionsResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateInstanceRestrictionsResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.InstanceRestrictions;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdateInstanceRestrictionsResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdateInstanceRestrictionsResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdateInstanceRestrictionsResponse implements com.clerk.backend_api
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.InstanceRestrictions> instanceRestrictions;
+    private Optional<? extends InstanceRestrictions> instanceRestrictions;
 
     @JsonCreator
     public UpdateInstanceRestrictionsResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.InstanceRestrictions> instanceRestrictions) {
+            Optional<? extends InstanceRestrictions> instanceRestrictions) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.InstanceRestrictions> instanceRestrictions() {
-        return (Optional<com.clerk.backend_api.models.components.InstanceRestrictions>) instanceRestrictions;
+    public Optional<InstanceRestrictions> instanceRestrictions() {
+        return (Optional<InstanceRestrictions>) instanceRestrictions;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdateInstanceRestrictionsResponse withRawResponse(HttpResponse<InputStre
     /**
      * Success
      */
-    public UpdateInstanceRestrictionsResponse withInstanceRestrictions(com.clerk.backend_api.models.components.InstanceRestrictions instanceRestrictions) {
+    public UpdateInstanceRestrictionsResponse withInstanceRestrictions(InstanceRestrictions instanceRestrictions) {
         Utils.checkNotNull(instanceRestrictions, "instanceRestrictions");
         this.instanceRestrictions = Optional.ofNullable(instanceRestrictions);
         return this;
@@ -137,7 +141,7 @@ public UpdateInstanceRestrictionsResponse withInstanceRestrictions(com.clerk.bac
     /**
      * Success
      */
-    public UpdateInstanceRestrictionsResponse withInstanceRestrictions(Optional<? extends com.clerk.backend_api.models.components.InstanceRestrictions> instanceRestrictions) {
+    public UpdateInstanceRestrictionsResponse withInstanceRestrictions(Optional<? extends InstanceRestrictions> instanceRestrictions) {
         Utils.checkNotNull(instanceRestrictions, "instanceRestrictions");
         this.instanceRestrictions = instanceRestrictions;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateInstanceRestrictionsResponse other = (UpdateInstanceRestrictionsResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.instanceRestrictions, other.instanceRestrictions);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.instanceRestrictions, other.instanceRestrictions);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.InstanceRestrictions> instanceRestrictions = Optional.empty();  
+        private Optional<? extends InstanceRestrictions> instanceRestrictions = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder instanceRestrictions(com.clerk.backend_api.models.components.InstanceRestrictions instanceRestrictions) {
+        public Builder instanceRestrictions(InstanceRestrictions instanceRestrictions) {
             Utils.checkNotNull(instanceRestrictions, "instanceRestrictions");
             this.instanceRestrictions = Optional.ofNullable(instanceRestrictions);
             return this;
@@ -230,7 +234,7 @@ public Builder instanceRestrictions(com.clerk.backend_api.models.components.Inst
         /**
          * Success
          */
-        public Builder instanceRestrictions(Optional<? extends com.clerk.backend_api.models.components.InstanceRestrictions> instanceRestrictions) {
+        public Builder instanceRestrictions(Optional<? extends InstanceRestrictions> instanceRestrictions) {
             Utils.checkNotNull(instanceRestrictions, "instanceRestrictions");
             this.instanceRestrictions = instanceRestrictions;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateClaims.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateClaims.java
index 61e26f6..5a5258f 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateClaims.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateClaims.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * UpdateJWTTemplateClaims - JWT template claims in JSON format
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateRequest.java
index 52edfa3..f9f2d52 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateRequest.java
@@ -4,18 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class UpdateJWTTemplateRequest {
 
     /**
@@ -91,13 +91,13 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateJWTTemplateRequest other = (UpdateJWTTemplateRequest) o;
         return 
-            java.util.Objects.deepEquals(this.templateId, other.templateId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.templateId, other.templateId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             templateId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateRequestBody.java
index 0ae618c..4db354c 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateRequestBody.java
@@ -4,21 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Double;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class UpdateJWTTemplateRequestBody {
 
     /**
@@ -26,7 +28,7 @@ public class UpdateJWTTemplateRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("name")
-    private Optional<? extends String> name;
+    private Optional<String> name;
 
     /**
      * JWT template claims in JSON format
@@ -40,45 +42,45 @@ public class UpdateJWTTemplateRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("lifetime")
-    private JsonNullable<? extends Double> lifetime;
+    private JsonNullable<Double> lifetime;
 
     /**
      * JWT token allowed clock skew
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("allowed_clock_skew")
-    private JsonNullable<? extends Double> allowedClockSkew;
+    private JsonNullable<Double> allowedClockSkew;
 
     /**
      * Whether a custom signing key/algorithm is also provided for this template
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("custom_signing_key")
-    private Optional<? extends Boolean> customSigningKey;
+    private Optional<Boolean> customSigningKey;
 
     /**
      * The custom signing algorithm to use when minting JWTs
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("signing_algorithm")
-    private JsonNullable<? extends String> signingAlgorithm;
+    private JsonNullable<String> signingAlgorithm;
 
     /**
      * The custom signing private key to use when minting JWTs
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("signing_key")
-    private JsonNullable<? extends String> signingKey;
+    private JsonNullable<String> signingKey;
 
     @JsonCreator
     public UpdateJWTTemplateRequestBody(
-            @JsonProperty("name") Optional<? extends String> name,
+            @JsonProperty("name") Optional<String> name,
             @JsonProperty("claims") Optional<? extends UpdateJWTTemplateClaims> claims,
-            @JsonProperty("lifetime") JsonNullable<? extends Double> lifetime,
-            @JsonProperty("allowed_clock_skew") JsonNullable<? extends Double> allowedClockSkew,
-            @JsonProperty("custom_signing_key") Optional<? extends Boolean> customSigningKey,
-            @JsonProperty("signing_algorithm") JsonNullable<? extends String> signingAlgorithm,
-            @JsonProperty("signing_key") JsonNullable<? extends String> signingKey) {
+            @JsonProperty("lifetime") JsonNullable<Double> lifetime,
+            @JsonProperty("allowed_clock_skew") JsonNullable<Double> allowedClockSkew,
+            @JsonProperty("custom_signing_key") Optional<Boolean> customSigningKey,
+            @JsonProperty("signing_algorithm") JsonNullable<String> signingAlgorithm,
+            @JsonProperty("signing_key") JsonNullable<String> signingKey) {
         Utils.checkNotNull(name, "name");
         Utils.checkNotNull(claims, "claims");
         Utils.checkNotNull(lifetime, "lifetime");
@@ -102,10 +104,9 @@ public UpdateJWTTemplateRequestBody() {
     /**
      * JWT template name
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> name() {
-        return (Optional<String>) name;
+        return name;
     }
 
     /**
@@ -120,46 +121,41 @@ public Optional<UpdateJWTTemplateClaims> claims() {
     /**
      * JWT token lifetime
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Double> lifetime() {
-        return (JsonNullable<Double>) lifetime;
+        return lifetime;
     }
 
     /**
      * JWT token allowed clock skew
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Double> allowedClockSkew() {
-        return (JsonNullable<Double>) allowedClockSkew;
+        return allowedClockSkew;
     }
 
     /**
      * Whether a custom signing key/algorithm is also provided for this template
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> customSigningKey() {
-        return (Optional<Boolean>) customSigningKey;
+        return customSigningKey;
     }
 
     /**
      * The custom signing algorithm to use when minting JWTs
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> signingAlgorithm() {
-        return (JsonNullable<String>) signingAlgorithm;
+        return signingAlgorithm;
     }
 
     /**
      * The custom signing private key to use when minting JWTs
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> signingKey() {
-        return (JsonNullable<String>) signingKey;
+        return signingKey;
     }
 
     public final static Builder builder() {
@@ -178,7 +174,7 @@ public UpdateJWTTemplateRequestBody withName(String name) {
     /**
      * JWT template name
      */
-    public UpdateJWTTemplateRequestBody withName(Optional<? extends String> name) {
+    public UpdateJWTTemplateRequestBody withName(Optional<String> name) {
         Utils.checkNotNull(name, "name");
         this.name = name;
         return this;
@@ -214,7 +210,7 @@ public UpdateJWTTemplateRequestBody withLifetime(double lifetime) {
     /**
      * JWT token lifetime
      */
-    public UpdateJWTTemplateRequestBody withLifetime(JsonNullable<? extends Double> lifetime) {
+    public UpdateJWTTemplateRequestBody withLifetime(JsonNullable<Double> lifetime) {
         Utils.checkNotNull(lifetime, "lifetime");
         this.lifetime = lifetime;
         return this;
@@ -232,7 +228,7 @@ public UpdateJWTTemplateRequestBody withAllowedClockSkew(double allowedClockSkew
     /**
      * JWT token allowed clock skew
      */
-    public UpdateJWTTemplateRequestBody withAllowedClockSkew(JsonNullable<? extends Double> allowedClockSkew) {
+    public UpdateJWTTemplateRequestBody withAllowedClockSkew(JsonNullable<Double> allowedClockSkew) {
         Utils.checkNotNull(allowedClockSkew, "allowedClockSkew");
         this.allowedClockSkew = allowedClockSkew;
         return this;
@@ -250,7 +246,7 @@ public UpdateJWTTemplateRequestBody withCustomSigningKey(boolean customSigningKe
     /**
      * Whether a custom signing key/algorithm is also provided for this template
      */
-    public UpdateJWTTemplateRequestBody withCustomSigningKey(Optional<? extends Boolean> customSigningKey) {
+    public UpdateJWTTemplateRequestBody withCustomSigningKey(Optional<Boolean> customSigningKey) {
         Utils.checkNotNull(customSigningKey, "customSigningKey");
         this.customSigningKey = customSigningKey;
         return this;
@@ -268,7 +264,7 @@ public UpdateJWTTemplateRequestBody withSigningAlgorithm(String signingAlgorithm
     /**
      * The custom signing algorithm to use when minting JWTs
      */
-    public UpdateJWTTemplateRequestBody withSigningAlgorithm(JsonNullable<? extends String> signingAlgorithm) {
+    public UpdateJWTTemplateRequestBody withSigningAlgorithm(JsonNullable<String> signingAlgorithm) {
         Utils.checkNotNull(signingAlgorithm, "signingAlgorithm");
         this.signingAlgorithm = signingAlgorithm;
         return this;
@@ -286,7 +282,7 @@ public UpdateJWTTemplateRequestBody withSigningKey(String signingKey) {
     /**
      * The custom signing private key to use when minting JWTs
      */
-    public UpdateJWTTemplateRequestBody withSigningKey(JsonNullable<? extends String> signingKey) {
+    public UpdateJWTTemplateRequestBody withSigningKey(JsonNullable<String> signingKey) {
         Utils.checkNotNull(signingKey, "signingKey");
         this.signingKey = signingKey;
         return this;
@@ -302,18 +298,18 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateJWTTemplateRequestBody other = (UpdateJWTTemplateRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.claims, other.claims) &&
-            java.util.Objects.deepEquals(this.lifetime, other.lifetime) &&
-            java.util.Objects.deepEquals(this.allowedClockSkew, other.allowedClockSkew) &&
-            java.util.Objects.deepEquals(this.customSigningKey, other.customSigningKey) &&
-            java.util.Objects.deepEquals(this.signingAlgorithm, other.signingAlgorithm) &&
-            java.util.Objects.deepEquals(this.signingKey, other.signingKey);
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.claims, other.claims) &&
+            Objects.deepEquals(this.lifetime, other.lifetime) &&
+            Objects.deepEquals(this.allowedClockSkew, other.allowedClockSkew) &&
+            Objects.deepEquals(this.customSigningKey, other.customSigningKey) &&
+            Objects.deepEquals(this.signingAlgorithm, other.signingAlgorithm) &&
+            Objects.deepEquals(this.signingKey, other.signingKey);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             name,
             claims,
             lifetime,
@@ -337,19 +333,19 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> name = Optional.empty();
+        private Optional<String> name = Optional.empty();
  
         private Optional<? extends UpdateJWTTemplateClaims> claims = Optional.empty();
  
-        private JsonNullable<? extends Double> lifetime = JsonNullable.undefined();
+        private JsonNullable<Double> lifetime = JsonNullable.undefined();
  
-        private JsonNullable<? extends Double> allowedClockSkew = JsonNullable.undefined();
+        private JsonNullable<Double> allowedClockSkew = JsonNullable.undefined();
  
-        private Optional<? extends Boolean> customSigningKey = Optional.empty();
+        private Optional<Boolean> customSigningKey = Optional.empty();
  
-        private JsonNullable<? extends String> signingAlgorithm = JsonNullable.undefined();
+        private JsonNullable<String> signingAlgorithm = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> signingKey = JsonNullable.undefined();  
+        private JsonNullable<String> signingKey = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -367,7 +363,7 @@ public Builder name(String name) {
         /**
          * JWT template name
          */
-        public Builder name(Optional<? extends String> name) {
+        public Builder name(Optional<String> name) {
             Utils.checkNotNull(name, "name");
             this.name = name;
             return this;
@@ -403,7 +399,7 @@ public Builder lifetime(double lifetime) {
         /**
          * JWT token lifetime
          */
-        public Builder lifetime(JsonNullable<? extends Double> lifetime) {
+        public Builder lifetime(JsonNullable<Double> lifetime) {
             Utils.checkNotNull(lifetime, "lifetime");
             this.lifetime = lifetime;
             return this;
@@ -421,7 +417,7 @@ public Builder allowedClockSkew(double allowedClockSkew) {
         /**
          * JWT token allowed clock skew
          */
-        public Builder allowedClockSkew(JsonNullable<? extends Double> allowedClockSkew) {
+        public Builder allowedClockSkew(JsonNullable<Double> allowedClockSkew) {
             Utils.checkNotNull(allowedClockSkew, "allowedClockSkew");
             this.allowedClockSkew = allowedClockSkew;
             return this;
@@ -439,7 +435,7 @@ public Builder customSigningKey(boolean customSigningKey) {
         /**
          * Whether a custom signing key/algorithm is also provided for this template
          */
-        public Builder customSigningKey(Optional<? extends Boolean> customSigningKey) {
+        public Builder customSigningKey(Optional<Boolean> customSigningKey) {
             Utils.checkNotNull(customSigningKey, "customSigningKey");
             this.customSigningKey = customSigningKey;
             return this;
@@ -457,7 +453,7 @@ public Builder signingAlgorithm(String signingAlgorithm) {
         /**
          * The custom signing algorithm to use when minting JWTs
          */
-        public Builder signingAlgorithm(JsonNullable<? extends String> signingAlgorithm) {
+        public Builder signingAlgorithm(JsonNullable<String> signingAlgorithm) {
             Utils.checkNotNull(signingAlgorithm, "signingAlgorithm");
             this.signingAlgorithm = signingAlgorithm;
             return this;
@@ -475,7 +471,7 @@ public Builder signingKey(String signingKey) {
         /**
          * The custom signing private key to use when minting JWTs
          */
-        public Builder signingKey(JsonNullable<? extends String> signingKey) {
+        public Builder signingKey(JsonNullable<String> signingKey) {
             Utils.checkNotNull(signingKey, "signingKey");
             this.signingKey = signingKey;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateRequestBuilder.java
index 7d4d52b..e183d20 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateRequestBuilder.java
@@ -4,18 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.String;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class UpdateJWTTemplateRequestBuilder {
 
@@ -27,19 +18,19 @@ public UpdateJWTTemplateRequestBuilder(SDKMethodInterfaces.MethodCallUpdateJWTTe
         this.sdk = sdk;
     }
 
-    public UpdateJWTTemplateRequestBuilder templateId(String templateId) {
+    public UpdateJWTTemplateRequestBuilder templateId(java.lang.String templateId) {
         Utils.checkNotNull(templateId, "templateId");
         this.templateId = templateId;
         return this;
     }
                 
-    public UpdateJWTTemplateRequestBuilder requestBody(UpdateJWTTemplateRequestBody requestBody) {
+    public UpdateJWTTemplateRequestBuilder requestBody(com.clerk.backend_api.models.operations.UpdateJWTTemplateRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = Optional.of(requestBody);
         return this;
     }
 
-    public UpdateJWTTemplateRequestBuilder requestBody(Optional<? extends UpdateJWTTemplateRequestBody> requestBody) {
+    public UpdateJWTTemplateRequestBuilder requestBody(java.util.Optional<? extends com.clerk.backend_api.models.operations.UpdateJWTTemplateRequestBody> requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateResponse.java
index 75fa921..cc64844 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateJWTTemplateResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.JWTTemplate;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdateJWTTemplateResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdateJWTTemplateResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdateJWTTemplateResponse implements com.clerk.backend_api.utils.Re
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate;
+    private Optional<? extends JWTTemplate> jwtTemplate;
 
     @JsonCreator
     public UpdateJWTTemplateResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate) {
+            Optional<? extends JWTTemplate> jwtTemplate) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate() {
-        return (Optional<com.clerk.backend_api.models.components.JWTTemplate>) jwtTemplate;
+    public Optional<JWTTemplate> jwtTemplate() {
+        return (Optional<JWTTemplate>) jwtTemplate;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdateJWTTemplateResponse withRawResponse(HttpResponse<InputStream> rawRe
     /**
      * Success
      */
-    public UpdateJWTTemplateResponse withJWTTemplate(com.clerk.backend_api.models.components.JWTTemplate jwtTemplate) {
+    public UpdateJWTTemplateResponse withJWTTemplate(JWTTemplate jwtTemplate) {
         Utils.checkNotNull(jwtTemplate, "jwtTemplate");
         this.jwtTemplate = Optional.ofNullable(jwtTemplate);
         return this;
@@ -137,7 +141,7 @@ public UpdateJWTTemplateResponse withJWTTemplate(com.clerk.backend_api.models.co
     /**
      * Success
      */
-    public UpdateJWTTemplateResponse withJWTTemplate(Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate) {
+    public UpdateJWTTemplateResponse withJWTTemplate(Optional<? extends JWTTemplate> jwtTemplate) {
         Utils.checkNotNull(jwtTemplate, "jwtTemplate");
         this.jwtTemplate = jwtTemplate;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateJWTTemplateResponse other = (UpdateJWTTemplateResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.jwtTemplate, other.jwtTemplate);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.jwtTemplate, other.jwtTemplate);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate = Optional.empty();  
+        private Optional<? extends JWTTemplate> jwtTemplate = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder jwtTemplate(com.clerk.backend_api.models.components.JWTTemplate jwtTemplate) {
+        public Builder jwtTemplate(JWTTemplate jwtTemplate) {
             Utils.checkNotNull(jwtTemplate, "jwtTemplate");
             this.jwtTemplate = Optional.ofNullable(jwtTemplate);
             return this;
@@ -230,7 +234,7 @@ public Builder jwtTemplate(com.clerk.backend_api.models.components.JWTTemplate j
         /**
          * Success
          */
-        public Builder jwtTemplate(Optional<? extends com.clerk.backend_api.models.components.JWTTemplate> jwtTemplate) {
+        public Builder jwtTemplate(Optional<? extends JWTTemplate> jwtTemplate) {
             Utils.checkNotNull(jwtTemplate, "jwtTemplate");
             this.jwtTemplate = jwtTemplate;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationRequest.java
index 0e0259a..2cb5656 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class UpdateOAuthApplicationRequest {
 
@@ -78,13 +77,13 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateOAuthApplicationRequest other = (UpdateOAuthApplicationRequest) o;
         return 
-            java.util.Objects.deepEquals(this.oauthApplicationId, other.oauthApplicationId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.oauthApplicationId, other.oauthApplicationId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             oauthApplicationId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationRequestBody.java
index 8fdf750..19cf882 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationRequestBody.java
@@ -4,21 +4,21 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class UpdateOAuthApplicationRequestBody {
 
     /**
@@ -26,27 +26,27 @@ public class UpdateOAuthApplicationRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("name")
-    private Optional<? extends String> name;
+    private Optional<String> name;
 
     /**
      * The new callback URL of the OAuth application
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("callback_url")
-    private Optional<? extends String> callbackUrl;
+    private Optional<String> callbackUrl;
 
     /**
      * Define the allowed scopes for the new OAuth applications that dictate the user payload of the OAuth user info endpoint. Available scopes are `profile`, `email`, `public_metadata`, `private_metadata`. Provide the requested scopes as a string, separated by spaces.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("scopes")
-    private Optional<? extends String> scopes;
+    private Optional<String> scopes;
 
     @JsonCreator
     public UpdateOAuthApplicationRequestBody(
-            @JsonProperty("name") Optional<? extends String> name,
-            @JsonProperty("callback_url") Optional<? extends String> callbackUrl,
-            @JsonProperty("scopes") Optional<? extends String> scopes) {
+            @JsonProperty("name") Optional<String> name,
+            @JsonProperty("callback_url") Optional<String> callbackUrl,
+            @JsonProperty("scopes") Optional<String> scopes) {
         Utils.checkNotNull(name, "name");
         Utils.checkNotNull(callbackUrl, "callbackUrl");
         Utils.checkNotNull(scopes, "scopes");
@@ -62,28 +62,25 @@ public UpdateOAuthApplicationRequestBody() {
     /**
      * The new name of the OAuth application
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> name() {
-        return (Optional<String>) name;
+        return name;
     }
 
     /**
      * The new callback URL of the OAuth application
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> callbackUrl() {
-        return (Optional<String>) callbackUrl;
+        return callbackUrl;
     }
 
     /**
      * Define the allowed scopes for the new OAuth applications that dictate the user payload of the OAuth user info endpoint. Available scopes are `profile`, `email`, `public_metadata`, `private_metadata`. Provide the requested scopes as a string, separated by spaces.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> scopes() {
-        return (Optional<String>) scopes;
+        return scopes;
     }
 
     public final static Builder builder() {
@@ -102,7 +99,7 @@ public UpdateOAuthApplicationRequestBody withName(String name) {
     /**
      * The new name of the OAuth application
      */
-    public UpdateOAuthApplicationRequestBody withName(Optional<? extends String> name) {
+    public UpdateOAuthApplicationRequestBody withName(Optional<String> name) {
         Utils.checkNotNull(name, "name");
         this.name = name;
         return this;
@@ -120,7 +117,7 @@ public UpdateOAuthApplicationRequestBody withCallbackUrl(String callbackUrl) {
     /**
      * The new callback URL of the OAuth application
      */
-    public UpdateOAuthApplicationRequestBody withCallbackUrl(Optional<? extends String> callbackUrl) {
+    public UpdateOAuthApplicationRequestBody withCallbackUrl(Optional<String> callbackUrl) {
         Utils.checkNotNull(callbackUrl, "callbackUrl");
         this.callbackUrl = callbackUrl;
         return this;
@@ -138,7 +135,7 @@ public UpdateOAuthApplicationRequestBody withScopes(String scopes) {
     /**
      * Define the allowed scopes for the new OAuth applications that dictate the user payload of the OAuth user info endpoint. Available scopes are `profile`, `email`, `public_metadata`, `private_metadata`. Provide the requested scopes as a string, separated by spaces.
      */
-    public UpdateOAuthApplicationRequestBody withScopes(Optional<? extends String> scopes) {
+    public UpdateOAuthApplicationRequestBody withScopes(Optional<String> scopes) {
         Utils.checkNotNull(scopes, "scopes");
         this.scopes = scopes;
         return this;
@@ -154,14 +151,14 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateOAuthApplicationRequestBody other = (UpdateOAuthApplicationRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.callbackUrl, other.callbackUrl) &&
-            java.util.Objects.deepEquals(this.scopes, other.scopes);
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.callbackUrl, other.callbackUrl) &&
+            Objects.deepEquals(this.scopes, other.scopes);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             name,
             callbackUrl,
             scopes);
@@ -177,11 +174,11 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> name = Optional.empty();
+        private Optional<String> name = Optional.empty();
  
-        private Optional<? extends String> callbackUrl = Optional.empty();
+        private Optional<String> callbackUrl = Optional.empty();
  
-        private Optional<? extends String> scopes;  
+        private Optional<String> scopes;  
         
         private Builder() {
           // force use of static builder() method
@@ -199,7 +196,7 @@ public Builder name(String name) {
         /**
          * The new name of the OAuth application
          */
-        public Builder name(Optional<? extends String> name) {
+        public Builder name(Optional<String> name) {
             Utils.checkNotNull(name, "name");
             this.name = name;
             return this;
@@ -217,7 +214,7 @@ public Builder callbackUrl(String callbackUrl) {
         /**
          * The new callback URL of the OAuth application
          */
-        public Builder callbackUrl(Optional<? extends String> callbackUrl) {
+        public Builder callbackUrl(Optional<String> callbackUrl) {
             Utils.checkNotNull(callbackUrl, "callbackUrl");
             this.callbackUrl = callbackUrl;
             return this;
@@ -235,7 +232,7 @@ public Builder scopes(String scopes) {
         /**
          * Define the allowed scopes for the new OAuth applications that dictate the user payload of the OAuth user info endpoint. Available scopes are `profile`, `email`, `public_metadata`, `private_metadata`. Provide the requested scopes as a string, separated by spaces.
          */
-        public Builder scopes(Optional<? extends String> scopes) {
+        public Builder scopes(Optional<String> scopes) {
             Utils.checkNotNull(scopes, "scopes");
             this.scopes = scopes;
             return this;
@@ -251,11 +248,11 @@ public UpdateOAuthApplicationRequestBody build() {
                 scopes);
         }
 
-        private static final LazySingletonValue<Optional<? extends String>> _SINGLETON_VALUE_Scopes =
+        private static final LazySingletonValue<Optional<String>> _SINGLETON_VALUE_Scopes =
                 new LazySingletonValue<>(
                         "scopes",
                         "\"profile email\"",
-                        new TypeReference<Optional<? extends String>>() {});
+                        new TypeReference<Optional<String>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationRequestBuilder.java
index 4a1104b..4f506c4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class UpdateOAuthApplicationRequestBuilder {
 
@@ -27,13 +17,13 @@ public UpdateOAuthApplicationRequestBuilder(SDKMethodInterfaces.MethodCallUpdate
         this.sdk = sdk;
     }
 
-    public UpdateOAuthApplicationRequestBuilder oauthApplicationId(String oauthApplicationId) {
+    public UpdateOAuthApplicationRequestBuilder oauthApplicationId(java.lang.String oauthApplicationId) {
         Utils.checkNotNull(oauthApplicationId, "oauthApplicationId");
         this.oauthApplicationId = oauthApplicationId;
         return this;
     }
 
-    public UpdateOAuthApplicationRequestBuilder requestBody(UpdateOAuthApplicationRequestBody requestBody) {
+    public UpdateOAuthApplicationRequestBuilder requestBody(com.clerk.backend_api.models.operations.UpdateOAuthApplicationRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationResponse.java
index edbab02..b668a61 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOAuthApplicationResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OAuthApplication;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdateOAuthApplicationResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdateOAuthApplicationResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdateOAuthApplicationResponse implements com.clerk.backend_api.uti
     /**
      * An OAuth application
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OAuthApplication> oAuthApplication;
+    private Optional<? extends OAuthApplication> oAuthApplication;
 
     @JsonCreator
     public UpdateOAuthApplicationResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OAuthApplication> oAuthApplication) {
+            Optional<? extends OAuthApplication> oAuthApplication) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OAuthApplication> oAuthApplication() {
-        return (Optional<com.clerk.backend_api.models.components.OAuthApplication>) oAuthApplication;
+    public Optional<OAuthApplication> oAuthApplication() {
+        return (Optional<OAuthApplication>) oAuthApplication;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdateOAuthApplicationResponse withRawResponse(HttpResponse<InputStream>
     /**
      * An OAuth application
      */
-    public UpdateOAuthApplicationResponse withOAuthApplication(com.clerk.backend_api.models.components.OAuthApplication oAuthApplication) {
+    public UpdateOAuthApplicationResponse withOAuthApplication(OAuthApplication oAuthApplication) {
         Utils.checkNotNull(oAuthApplication, "oAuthApplication");
         this.oAuthApplication = Optional.ofNullable(oAuthApplication);
         return this;
@@ -137,7 +141,7 @@ public UpdateOAuthApplicationResponse withOAuthApplication(com.clerk.backend_api
     /**
      * An OAuth application
      */
-    public UpdateOAuthApplicationResponse withOAuthApplication(Optional<? extends com.clerk.backend_api.models.components.OAuthApplication> oAuthApplication) {
+    public UpdateOAuthApplicationResponse withOAuthApplication(Optional<? extends OAuthApplication> oAuthApplication) {
         Utils.checkNotNull(oAuthApplication, "oAuthApplication");
         this.oAuthApplication = oAuthApplication;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateOAuthApplicationResponse other = (UpdateOAuthApplicationResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.oAuthApplication, other.oAuthApplication);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.oAuthApplication, other.oAuthApplication);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OAuthApplication> oAuthApplication = Optional.empty();  
+        private Optional<? extends OAuthApplication> oAuthApplication = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * An OAuth application
          */
-        public Builder oAuthApplication(com.clerk.backend_api.models.components.OAuthApplication oAuthApplication) {
+        public Builder oAuthApplication(OAuthApplication oAuthApplication) {
             Utils.checkNotNull(oAuthApplication, "oAuthApplication");
             this.oAuthApplication = Optional.ofNullable(oAuthApplication);
             return this;
@@ -230,7 +234,7 @@ public Builder oAuthApplication(com.clerk.backend_api.models.components.OAuthApp
         /**
          * An OAuth application
          */
-        public Builder oAuthApplication(Optional<? extends com.clerk.backend_api.models.components.OAuthApplication> oAuthApplication) {
+        public Builder oAuthApplication(Optional<? extends OAuthApplication> oAuthApplication) {
             Utils.checkNotNull(oAuthApplication, "oAuthApplication");
             this.oAuthApplication = oAuthApplication;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataPrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataPrivateMetadata.java
index 49bf4e3..1ec8339 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataPrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataPrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * UpdateOrganizationMembershipMetadataPrivateMetadata - Metadata saved on the organization membership that is only visible to your backend.
  * The new object will be merged with the existing value.
@@ -43,7 +41,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataPublicMetadata.java
index c74e6fb..bcaec25 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * UpdateOrganizationMembershipMetadataPublicMetadata - Metadata saved on the organization membership, that is visible to both your frontend and backend.
  * The new object will be merged with the existing value.
@@ -43,7 +41,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataRequest.java
index 0b07cc3..c86caa2 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class UpdateOrganizationMembershipMetadataRequest {
 
@@ -104,14 +103,14 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateOrganizationMembershipMetadataRequest other = (UpdateOrganizationMembershipMetadataRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId,
             userId,
             requestBody);
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataRequestBody.java
index 7ccc496..6ce35a5 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataRequestBody.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class UpdateOrganizationMembershipMetadataRequestBody {
 
     /**
@@ -124,13 +124,13 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateOrganizationMembershipMetadataRequestBody other = (UpdateOrganizationMembershipMetadataRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata);
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             publicMetadata,
             privateMetadata);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataRequestBuilder.java
index 5e299bd..0e59c16 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class UpdateOrganizationMembershipMetadataRequestBuilder {
 
@@ -28,19 +18,19 @@ public UpdateOrganizationMembershipMetadataRequestBuilder(SDKMethodInterfaces.Me
         this.sdk = sdk;
     }
 
-    public UpdateOrganizationMembershipMetadataRequestBuilder organizationId(String organizationId) {
+    public UpdateOrganizationMembershipMetadataRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
     }
 
-    public UpdateOrganizationMembershipMetadataRequestBuilder userId(String userId) {
+    public UpdateOrganizationMembershipMetadataRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
     }
 
-    public UpdateOrganizationMembershipMetadataRequestBuilder requestBody(UpdateOrganizationMembershipMetadataRequestBody requestBody) {
+    public UpdateOrganizationMembershipMetadataRequestBuilder requestBody(com.clerk.backend_api.models.operations.UpdateOrganizationMembershipMetadataRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataResponse.java
index 1c4ee08..8c20eae 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipMetadataResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OrganizationMembership;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdateOrganizationMembershipMetadataResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdateOrganizationMembershipMetadataResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdateOrganizationMembershipMetadataResponse implements com.clerk.b
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership;
+    private Optional<? extends OrganizationMembership> organizationMembership;
 
     @JsonCreator
     public UpdateOrganizationMembershipMetadataResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership) {
+            Optional<? extends OrganizationMembership> organizationMembership) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership() {
-        return (Optional<com.clerk.backend_api.models.components.OrganizationMembership>) organizationMembership;
+    public Optional<OrganizationMembership> organizationMembership() {
+        return (Optional<OrganizationMembership>) organizationMembership;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdateOrganizationMembershipMetadataResponse withRawResponse(HttpResponse
     /**
      * Success
      */
-    public UpdateOrganizationMembershipMetadataResponse withOrganizationMembership(com.clerk.backend_api.models.components.OrganizationMembership organizationMembership) {
+    public UpdateOrganizationMembershipMetadataResponse withOrganizationMembership(OrganizationMembership organizationMembership) {
         Utils.checkNotNull(organizationMembership, "organizationMembership");
         this.organizationMembership = Optional.ofNullable(organizationMembership);
         return this;
@@ -137,7 +141,7 @@ public UpdateOrganizationMembershipMetadataResponse withOrganizationMembership(c
     /**
      * Success
      */
-    public UpdateOrganizationMembershipMetadataResponse withOrganizationMembership(Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership) {
+    public UpdateOrganizationMembershipMetadataResponse withOrganizationMembership(Optional<? extends OrganizationMembership> organizationMembership) {
         Utils.checkNotNull(organizationMembership, "organizationMembership");
         this.organizationMembership = organizationMembership;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateOrganizationMembershipMetadataResponse other = (UpdateOrganizationMembershipMetadataResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizationMembership, other.organizationMembership);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizationMembership, other.organizationMembership);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership = Optional.empty();  
+        private Optional<? extends OrganizationMembership> organizationMembership = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder organizationMembership(com.clerk.backend_api.models.components.OrganizationMembership organizationMembership) {
+        public Builder organizationMembership(OrganizationMembership organizationMembership) {
             Utils.checkNotNull(organizationMembership, "organizationMembership");
             this.organizationMembership = Optional.ofNullable(organizationMembership);
             return this;
@@ -230,7 +234,7 @@ public Builder organizationMembership(com.clerk.backend_api.models.components.Or
         /**
          * Success
          */
-        public Builder organizationMembership(Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership) {
+        public Builder organizationMembership(Optional<? extends OrganizationMembership> organizationMembership) {
             Utils.checkNotNull(organizationMembership, "organizationMembership");
             this.organizationMembership = organizationMembership;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipRequest.java
index a5f9bd9..dafa856 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class UpdateOrganizationMembershipRequest {
 
@@ -104,14 +103,14 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateOrganizationMembershipRequest other = (UpdateOrganizationMembershipRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId,
             userId,
             requestBody);
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipRequestBody.java
index e7b468e..f40ff71 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipRequestBody.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class UpdateOrganizationMembershipRequestBody {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateOrganizationMembershipRequestBody other = (UpdateOrganizationMembershipRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.role, other.role);
+            Objects.deepEquals(this.role, other.role);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             role);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipRequestBuilder.java
index 06385c8..01d28ae 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class UpdateOrganizationMembershipRequestBuilder {
 
@@ -28,19 +18,19 @@ public UpdateOrganizationMembershipRequestBuilder(SDKMethodInterfaces.MethodCall
         this.sdk = sdk;
     }
 
-    public UpdateOrganizationMembershipRequestBuilder organizationId(String organizationId) {
+    public UpdateOrganizationMembershipRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
     }
 
-    public UpdateOrganizationMembershipRequestBuilder userId(String userId) {
+    public UpdateOrganizationMembershipRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
     }
 
-    public UpdateOrganizationMembershipRequestBuilder requestBody(UpdateOrganizationMembershipRequestBody requestBody) {
+    public UpdateOrganizationMembershipRequestBuilder requestBody(com.clerk.backend_api.models.operations.UpdateOrganizationMembershipRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipResponse.java
index 352bbbf..d53889d 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationMembershipResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OrganizationMembership;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdateOrganizationMembershipResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdateOrganizationMembershipResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdateOrganizationMembershipResponse implements com.clerk.backend_a
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership;
+    private Optional<? extends OrganizationMembership> organizationMembership;
 
     @JsonCreator
     public UpdateOrganizationMembershipResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership) {
+            Optional<? extends OrganizationMembership> organizationMembership) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership() {
-        return (Optional<com.clerk.backend_api.models.components.OrganizationMembership>) organizationMembership;
+    public Optional<OrganizationMembership> organizationMembership() {
+        return (Optional<OrganizationMembership>) organizationMembership;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdateOrganizationMembershipResponse withRawResponse(HttpResponse<InputSt
     /**
      * Success
      */
-    public UpdateOrganizationMembershipResponse withOrganizationMembership(com.clerk.backend_api.models.components.OrganizationMembership organizationMembership) {
+    public UpdateOrganizationMembershipResponse withOrganizationMembership(OrganizationMembership organizationMembership) {
         Utils.checkNotNull(organizationMembership, "organizationMembership");
         this.organizationMembership = Optional.ofNullable(organizationMembership);
         return this;
@@ -137,7 +141,7 @@ public UpdateOrganizationMembershipResponse withOrganizationMembership(com.clerk
     /**
      * Success
      */
-    public UpdateOrganizationMembershipResponse withOrganizationMembership(Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership) {
+    public UpdateOrganizationMembershipResponse withOrganizationMembership(Optional<? extends OrganizationMembership> organizationMembership) {
         Utils.checkNotNull(organizationMembership, "organizationMembership");
         this.organizationMembership = organizationMembership;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateOrganizationMembershipResponse other = (UpdateOrganizationMembershipResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizationMembership, other.organizationMembership);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizationMembership, other.organizationMembership);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership = Optional.empty();  
+        private Optional<? extends OrganizationMembership> organizationMembership = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder organizationMembership(com.clerk.backend_api.models.components.OrganizationMembership organizationMembership) {
+        public Builder organizationMembership(OrganizationMembership organizationMembership) {
             Utils.checkNotNull(organizationMembership, "organizationMembership");
             this.organizationMembership = Optional.ofNullable(organizationMembership);
             return this;
@@ -230,7 +234,7 @@ public Builder organizationMembership(com.clerk.backend_api.models.components.Or
         /**
          * Success
          */
-        public Builder organizationMembership(Optional<? extends com.clerk.backend_api.models.components.OrganizationMembership> organizationMembership) {
+        public Builder organizationMembership(Optional<? extends OrganizationMembership> organizationMembership) {
             Utils.checkNotNull(organizationMembership, "organizationMembership");
             this.organizationMembership = organizationMembership;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationPrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationPrivateMetadata.java
index 04738bd..7c26aac 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationPrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationPrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * UpdateOrganizationPrivateMetadata - Metadata saved on the organization that is only visible to your backend.
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationPublicMetadata.java
index 45a917e..1f1d869 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * UpdateOrganizationPublicMetadata - Metadata saved on the organization, that is visible to both your frontend and backend.
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationRequest.java
index b4561d4..d6d51a2 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class UpdateOrganizationRequest {
 
@@ -78,13 +77,13 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateOrganizationRequest other = (UpdateOrganizationRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationRequestBody.java
index 7eb2423..edd4e3b 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationRequestBody.java
@@ -4,21 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class UpdateOrganizationRequestBody {
 
     /**
@@ -40,37 +42,37 @@ public class UpdateOrganizationRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("name")
-    private JsonNullable<? extends String> name;
+    private JsonNullable<String> name;
 
     /**
      * The new slug of the organization, which needs to be unique in the instance
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("slug")
-    private JsonNullable<? extends String> slug;
+    private JsonNullable<String> slug;
 
     /**
      * The maximum number of memberships allowed for this organization
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("max_allowed_memberships")
-    private JsonNullable<? extends Long> maxAllowedMemberships;
+    private JsonNullable<Long> maxAllowedMemberships;
 
     /**
      * If true, an admin can delete this organization with the Frontend API.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("admin_delete_enabled")
-    private JsonNullable<? extends Boolean> adminDeleteEnabled;
+    private JsonNullable<Boolean> adminDeleteEnabled;
 
     @JsonCreator
     public UpdateOrganizationRequestBody(
             @JsonProperty("public_metadata") Optional<? extends UpdateOrganizationPublicMetadata> publicMetadata,
             @JsonProperty("private_metadata") Optional<? extends UpdateOrganizationPrivateMetadata> privateMetadata,
-            @JsonProperty("name") JsonNullable<? extends String> name,
-            @JsonProperty("slug") JsonNullable<? extends String> slug,
-            @JsonProperty("max_allowed_memberships") JsonNullable<? extends Long> maxAllowedMemberships,
-            @JsonProperty("admin_delete_enabled") JsonNullable<? extends Boolean> adminDeleteEnabled) {
+            @JsonProperty("name") JsonNullable<String> name,
+            @JsonProperty("slug") JsonNullable<String> slug,
+            @JsonProperty("max_allowed_memberships") JsonNullable<Long> maxAllowedMemberships,
+            @JsonProperty("admin_delete_enabled") JsonNullable<Boolean> adminDeleteEnabled) {
         Utils.checkNotNull(publicMetadata, "publicMetadata");
         Utils.checkNotNull(privateMetadata, "privateMetadata");
         Utils.checkNotNull(name, "name");
@@ -110,37 +112,33 @@ public Optional<UpdateOrganizationPrivateMetadata> privateMetadata() {
     /**
      * The new name of the organization
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> name() {
-        return (JsonNullable<String>) name;
+        return name;
     }
 
     /**
      * The new slug of the organization, which needs to be unique in the instance
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> slug() {
-        return (JsonNullable<String>) slug;
+        return slug;
     }
 
     /**
      * The maximum number of memberships allowed for this organization
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Long> maxAllowedMemberships() {
-        return (JsonNullable<Long>) maxAllowedMemberships;
+        return maxAllowedMemberships;
     }
 
     /**
      * If true, an admin can delete this organization with the Frontend API.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> adminDeleteEnabled() {
-        return (JsonNullable<Boolean>) adminDeleteEnabled;
+        return adminDeleteEnabled;
     }
 
     public final static Builder builder() {
@@ -195,7 +193,7 @@ public UpdateOrganizationRequestBody withName(String name) {
     /**
      * The new name of the organization
      */
-    public UpdateOrganizationRequestBody withName(JsonNullable<? extends String> name) {
+    public UpdateOrganizationRequestBody withName(JsonNullable<String> name) {
         Utils.checkNotNull(name, "name");
         this.name = name;
         return this;
@@ -213,7 +211,7 @@ public UpdateOrganizationRequestBody withSlug(String slug) {
     /**
      * The new slug of the organization, which needs to be unique in the instance
      */
-    public UpdateOrganizationRequestBody withSlug(JsonNullable<? extends String> slug) {
+    public UpdateOrganizationRequestBody withSlug(JsonNullable<String> slug) {
         Utils.checkNotNull(slug, "slug");
         this.slug = slug;
         return this;
@@ -231,7 +229,7 @@ public UpdateOrganizationRequestBody withMaxAllowedMemberships(long maxAllowedMe
     /**
      * The maximum number of memberships allowed for this organization
      */
-    public UpdateOrganizationRequestBody withMaxAllowedMemberships(JsonNullable<? extends Long> maxAllowedMemberships) {
+    public UpdateOrganizationRequestBody withMaxAllowedMemberships(JsonNullable<Long> maxAllowedMemberships) {
         Utils.checkNotNull(maxAllowedMemberships, "maxAllowedMemberships");
         this.maxAllowedMemberships = maxAllowedMemberships;
         return this;
@@ -249,7 +247,7 @@ public UpdateOrganizationRequestBody withAdminDeleteEnabled(boolean adminDeleteE
     /**
      * If true, an admin can delete this organization with the Frontend API.
      */
-    public UpdateOrganizationRequestBody withAdminDeleteEnabled(JsonNullable<? extends Boolean> adminDeleteEnabled) {
+    public UpdateOrganizationRequestBody withAdminDeleteEnabled(JsonNullable<Boolean> adminDeleteEnabled) {
         Utils.checkNotNull(adminDeleteEnabled, "adminDeleteEnabled");
         this.adminDeleteEnabled = adminDeleteEnabled;
         return this;
@@ -265,17 +263,17 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateOrganizationRequestBody other = (UpdateOrganizationRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.slug, other.slug) &&
-            java.util.Objects.deepEquals(this.maxAllowedMemberships, other.maxAllowedMemberships) &&
-            java.util.Objects.deepEquals(this.adminDeleteEnabled, other.adminDeleteEnabled);
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.slug, other.slug) &&
+            Objects.deepEquals(this.maxAllowedMemberships, other.maxAllowedMemberships) &&
+            Objects.deepEquals(this.adminDeleteEnabled, other.adminDeleteEnabled);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             publicMetadata,
             privateMetadata,
             name,
@@ -301,13 +299,13 @@ public final static class Builder {
  
         private Optional<? extends UpdateOrganizationPrivateMetadata> privateMetadata = Optional.empty();
  
-        private JsonNullable<? extends String> name = JsonNullable.undefined();
+        private JsonNullable<String> name = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> slug = JsonNullable.undefined();
+        private JsonNullable<String> slug = JsonNullable.undefined();
  
-        private JsonNullable<? extends Long> maxAllowedMemberships = JsonNullable.undefined();
+        private JsonNullable<Long> maxAllowedMemberships = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> adminDeleteEnabled = JsonNullable.undefined();  
+        private JsonNullable<Boolean> adminDeleteEnabled = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -361,7 +359,7 @@ public Builder name(String name) {
         /**
          * The new name of the organization
          */
-        public Builder name(JsonNullable<? extends String> name) {
+        public Builder name(JsonNullable<String> name) {
             Utils.checkNotNull(name, "name");
             this.name = name;
             return this;
@@ -379,7 +377,7 @@ public Builder slug(String slug) {
         /**
          * The new slug of the organization, which needs to be unique in the instance
          */
-        public Builder slug(JsonNullable<? extends String> slug) {
+        public Builder slug(JsonNullable<String> slug) {
             Utils.checkNotNull(slug, "slug");
             this.slug = slug;
             return this;
@@ -397,7 +395,7 @@ public Builder maxAllowedMemberships(long maxAllowedMemberships) {
         /**
          * The maximum number of memberships allowed for this organization
          */
-        public Builder maxAllowedMemberships(JsonNullable<? extends Long> maxAllowedMemberships) {
+        public Builder maxAllowedMemberships(JsonNullable<Long> maxAllowedMemberships) {
             Utils.checkNotNull(maxAllowedMemberships, "maxAllowedMemberships");
             this.maxAllowedMemberships = maxAllowedMemberships;
             return this;
@@ -415,7 +413,7 @@ public Builder adminDeleteEnabled(boolean adminDeleteEnabled) {
         /**
          * If true, an admin can delete this organization with the Frontend API.
          */
-        public Builder adminDeleteEnabled(JsonNullable<? extends Boolean> adminDeleteEnabled) {
+        public Builder adminDeleteEnabled(JsonNullable<Boolean> adminDeleteEnabled) {
             Utils.checkNotNull(adminDeleteEnabled, "adminDeleteEnabled");
             this.adminDeleteEnabled = adminDeleteEnabled;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationRequestBuilder.java
index 78a805b..3d38fd5 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class UpdateOrganizationRequestBuilder {
 
@@ -27,13 +17,13 @@ public UpdateOrganizationRequestBuilder(SDKMethodInterfaces.MethodCallUpdateOrga
         this.sdk = sdk;
     }
 
-    public UpdateOrganizationRequestBuilder organizationId(String organizationId) {
+    public UpdateOrganizationRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
     }
 
-    public UpdateOrganizationRequestBuilder requestBody(UpdateOrganizationRequestBody requestBody) {
+    public UpdateOrganizationRequestBuilder requestBody(com.clerk.backend_api.models.operations.UpdateOrganizationRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationResponse.java
index 5d63429..8db24e8 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateOrganizationResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Organization;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdateOrganizationResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdateOrganizationResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdateOrganizationResponse implements com.clerk.backend_api.utils.R
     /**
      * An organization
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Organization> organization;
+    private Optional<? extends Organization> organization;
 
     @JsonCreator
     public UpdateOrganizationResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+            Optional<? extends Organization> organization) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Organization> organization() {
-        return (Optional<com.clerk.backend_api.models.components.Organization>) organization;
+    public Optional<Organization> organization() {
+        return (Optional<Organization>) organization;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdateOrganizationResponse withRawResponse(HttpResponse<InputStream> rawR
     /**
      * An organization
      */
-    public UpdateOrganizationResponse withOrganization(com.clerk.backend_api.models.components.Organization organization) {
+    public UpdateOrganizationResponse withOrganization(Organization organization) {
         Utils.checkNotNull(organization, "organization");
         this.organization = Optional.ofNullable(organization);
         return this;
@@ -137,7 +141,7 @@ public UpdateOrganizationResponse withOrganization(com.clerk.backend_api.models.
     /**
      * An organization
      */
-    public UpdateOrganizationResponse withOrganization(Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+    public UpdateOrganizationResponse withOrganization(Optional<? extends Organization> organization) {
         Utils.checkNotNull(organization, "organization");
         this.organization = organization;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateOrganizationResponse other = (UpdateOrganizationResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organization, other.organization);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organization, other.organization);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Organization> organization = Optional.empty();  
+        private Optional<? extends Organization> organization = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * An organization
          */
-        public Builder organization(com.clerk.backend_api.models.components.Organization organization) {
+        public Builder organization(Organization organization) {
             Utils.checkNotNull(organization, "organization");
             this.organization = Optional.ofNullable(organization);
             return this;
@@ -230,7 +234,7 @@ public Builder organization(com.clerk.backend_api.models.components.Organization
         /**
          * An organization
          */
-        public Builder organization(Optional<? extends com.clerk.backend_api.models.components.Organization> organization) {
+        public Builder organization(Optional<? extends Organization> organization) {
             Utils.checkNotNull(organization, "organization");
             this.organization = organization;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberRequest.java
index 75dcb94..ede296f 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberRequest.java
@@ -4,18 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class UpdatePhoneNumberRequest {
 
     /**
@@ -91,13 +91,13 @@ public boolean equals(java.lang.Object o) {
         }
         UpdatePhoneNumberRequest other = (UpdatePhoneNumberRequest) o;
         return 
-            java.util.Objects.deepEquals(this.phoneNumberId, other.phoneNumberId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.phoneNumberId, other.phoneNumberId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             phoneNumberId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberRequestBody.java
index 4a077f6..ba85ee3 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberRequestBody.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class UpdatePhoneNumberRequestBody {
 
     /**
@@ -25,14 +25,14 @@ public class UpdatePhoneNumberRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("verified")
-    private JsonNullable<? extends Boolean> verified;
+    private JsonNullable<Boolean> verified;
 
     /**
      * Set this phone number as the primary phone number for the user.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("primary")
-    private JsonNullable<? extends Boolean> primary;
+    private JsonNullable<Boolean> primary;
 
     /**
      * Set this phone number as reserved for multi-factor authentication.
@@ -41,13 +41,13 @@ public class UpdatePhoneNumberRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("reserved_for_second_factor")
-    private JsonNullable<? extends Boolean> reservedForSecondFactor;
+    private JsonNullable<Boolean> reservedForSecondFactor;
 
     @JsonCreator
     public UpdatePhoneNumberRequestBody(
-            @JsonProperty("verified") JsonNullable<? extends Boolean> verified,
-            @JsonProperty("primary") JsonNullable<? extends Boolean> primary,
-            @JsonProperty("reserved_for_second_factor") JsonNullable<? extends Boolean> reservedForSecondFactor) {
+            @JsonProperty("verified") JsonNullable<Boolean> verified,
+            @JsonProperty("primary") JsonNullable<Boolean> primary,
+            @JsonProperty("reserved_for_second_factor") JsonNullable<Boolean> reservedForSecondFactor) {
         Utils.checkNotNull(verified, "verified");
         Utils.checkNotNull(primary, "primary");
         Utils.checkNotNull(reservedForSecondFactor, "reservedForSecondFactor");
@@ -63,19 +63,17 @@ public UpdatePhoneNumberRequestBody() {
     /**
      * The phone number will be marked as verified.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> verified() {
-        return (JsonNullable<Boolean>) verified;
+        return verified;
     }
 
     /**
      * Set this phone number as the primary phone number for the user.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> primary() {
-        return (JsonNullable<Boolean>) primary;
+        return primary;
     }
 
     /**
@@ -83,10 +81,9 @@ public JsonNullable<Boolean> primary() {
      * The phone number must also be verified.
      * If there are no other reserved second factors, the phone number will be set as the default second factor.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> reservedForSecondFactor() {
-        return (JsonNullable<Boolean>) reservedForSecondFactor;
+        return reservedForSecondFactor;
     }
 
     public final static Builder builder() {
@@ -105,7 +102,7 @@ public UpdatePhoneNumberRequestBody withVerified(boolean verified) {
     /**
      * The phone number will be marked as verified.
      */
-    public UpdatePhoneNumberRequestBody withVerified(JsonNullable<? extends Boolean> verified) {
+    public UpdatePhoneNumberRequestBody withVerified(JsonNullable<Boolean> verified) {
         Utils.checkNotNull(verified, "verified");
         this.verified = verified;
         return this;
@@ -123,7 +120,7 @@ public UpdatePhoneNumberRequestBody withPrimary(boolean primary) {
     /**
      * Set this phone number as the primary phone number for the user.
      */
-    public UpdatePhoneNumberRequestBody withPrimary(JsonNullable<? extends Boolean> primary) {
+    public UpdatePhoneNumberRequestBody withPrimary(JsonNullable<Boolean> primary) {
         Utils.checkNotNull(primary, "primary");
         this.primary = primary;
         return this;
@@ -145,7 +142,7 @@ public UpdatePhoneNumberRequestBody withReservedForSecondFactor(boolean reserved
      * The phone number must also be verified.
      * If there are no other reserved second factors, the phone number will be set as the default second factor.
      */
-    public UpdatePhoneNumberRequestBody withReservedForSecondFactor(JsonNullable<? extends Boolean> reservedForSecondFactor) {
+    public UpdatePhoneNumberRequestBody withReservedForSecondFactor(JsonNullable<Boolean> reservedForSecondFactor) {
         Utils.checkNotNull(reservedForSecondFactor, "reservedForSecondFactor");
         this.reservedForSecondFactor = reservedForSecondFactor;
         return this;
@@ -161,14 +158,14 @@ public boolean equals(java.lang.Object o) {
         }
         UpdatePhoneNumberRequestBody other = (UpdatePhoneNumberRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.verified, other.verified) &&
-            java.util.Objects.deepEquals(this.primary, other.primary) &&
-            java.util.Objects.deepEquals(this.reservedForSecondFactor, other.reservedForSecondFactor);
+            Objects.deepEquals(this.verified, other.verified) &&
+            Objects.deepEquals(this.primary, other.primary) &&
+            Objects.deepEquals(this.reservedForSecondFactor, other.reservedForSecondFactor);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             verified,
             primary,
             reservedForSecondFactor);
@@ -184,11 +181,11 @@ public String toString() {
     
     public final static class Builder {
  
-        private JsonNullable<? extends Boolean> verified = JsonNullable.undefined();
+        private JsonNullable<Boolean> verified = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> primary = JsonNullable.undefined();
+        private JsonNullable<Boolean> primary = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> reservedForSecondFactor = JsonNullable.undefined();  
+        private JsonNullable<Boolean> reservedForSecondFactor = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -206,7 +203,7 @@ public Builder verified(boolean verified) {
         /**
          * The phone number will be marked as verified.
          */
-        public Builder verified(JsonNullable<? extends Boolean> verified) {
+        public Builder verified(JsonNullable<Boolean> verified) {
             Utils.checkNotNull(verified, "verified");
             this.verified = verified;
             return this;
@@ -224,7 +221,7 @@ public Builder primary(boolean primary) {
         /**
          * Set this phone number as the primary phone number for the user.
          */
-        public Builder primary(JsonNullable<? extends Boolean> primary) {
+        public Builder primary(JsonNullable<Boolean> primary) {
             Utils.checkNotNull(primary, "primary");
             this.primary = primary;
             return this;
@@ -246,7 +243,7 @@ public Builder reservedForSecondFactor(boolean reservedForSecondFactor) {
          * The phone number must also be verified.
          * If there are no other reserved second factors, the phone number will be set as the default second factor.
          */
-        public Builder reservedForSecondFactor(JsonNullable<? extends Boolean> reservedForSecondFactor) {
+        public Builder reservedForSecondFactor(JsonNullable<Boolean> reservedForSecondFactor) {
             Utils.checkNotNull(reservedForSecondFactor, "reservedForSecondFactor");
             this.reservedForSecondFactor = reservedForSecondFactor;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberRequestBuilder.java
index 0fcfb4c..c615729 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberRequestBuilder.java
@@ -4,18 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.String;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class UpdatePhoneNumberRequestBuilder {
 
@@ -27,19 +18,19 @@ public UpdatePhoneNumberRequestBuilder(SDKMethodInterfaces.MethodCallUpdatePhone
         this.sdk = sdk;
     }
 
-    public UpdatePhoneNumberRequestBuilder phoneNumberId(String phoneNumberId) {
+    public UpdatePhoneNumberRequestBuilder phoneNumberId(java.lang.String phoneNumberId) {
         Utils.checkNotNull(phoneNumberId, "phoneNumberId");
         this.phoneNumberId = phoneNumberId;
         return this;
     }
                 
-    public UpdatePhoneNumberRequestBuilder requestBody(UpdatePhoneNumberRequestBody requestBody) {
+    public UpdatePhoneNumberRequestBuilder requestBody(com.clerk.backend_api.models.operations.UpdatePhoneNumberRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = Optional.of(requestBody);
         return this;
     }
 
-    public UpdatePhoneNumberRequestBuilder requestBody(Optional<? extends UpdatePhoneNumberRequestBody> requestBody) {
+    public UpdatePhoneNumberRequestBuilder requestBody(java.util.Optional<? extends com.clerk.backend_api.models.operations.UpdatePhoneNumberRequestBody> requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberResponse.java
index 3958cb1..bd224dd 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdatePhoneNumberResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.PhoneNumber;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdatePhoneNumberResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdatePhoneNumberResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdatePhoneNumberResponse implements com.clerk.backend_api.utils.Re
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber;
+    private Optional<? extends PhoneNumber> phoneNumber;
 
     @JsonCreator
     public UpdatePhoneNumberResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber) {
+            Optional<? extends PhoneNumber> phoneNumber) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.PhoneNumber> phoneNumber() {
-        return (Optional<com.clerk.backend_api.models.components.PhoneNumber>) phoneNumber;
+    public Optional<PhoneNumber> phoneNumber() {
+        return (Optional<PhoneNumber>) phoneNumber;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdatePhoneNumberResponse withRawResponse(HttpResponse<InputStream> rawRe
     /**
      * Success
      */
-    public UpdatePhoneNumberResponse withPhoneNumber(com.clerk.backend_api.models.components.PhoneNumber phoneNumber) {
+    public UpdatePhoneNumberResponse withPhoneNumber(PhoneNumber phoneNumber) {
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         this.phoneNumber = Optional.ofNullable(phoneNumber);
         return this;
@@ -137,7 +141,7 @@ public UpdatePhoneNumberResponse withPhoneNumber(com.clerk.backend_api.models.co
     /**
      * Success
      */
-    public UpdatePhoneNumberResponse withPhoneNumber(Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber) {
+    public UpdatePhoneNumberResponse withPhoneNumber(Optional<? extends PhoneNumber> phoneNumber) {
         Utils.checkNotNull(phoneNumber, "phoneNumber");
         this.phoneNumber = phoneNumber;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdatePhoneNumberResponse other = (UpdatePhoneNumberResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.phoneNumber, other.phoneNumber);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.phoneNumber, other.phoneNumber);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber = Optional.empty();  
+        private Optional<? extends PhoneNumber> phoneNumber = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder phoneNumber(com.clerk.backend_api.models.components.PhoneNumber phoneNumber) {
+        public Builder phoneNumber(PhoneNumber phoneNumber) {
             Utils.checkNotNull(phoneNumber, "phoneNumber");
             this.phoneNumber = Optional.ofNullable(phoneNumber);
             return this;
@@ -230,7 +234,7 @@ public Builder phoneNumber(com.clerk.backend_api.models.components.PhoneNumber p
         /**
          * Success
          */
-        public Builder phoneNumber(Optional<? extends com.clerk.backend_api.models.components.PhoneNumber> phoneNumber) {
+        public Builder phoneNumber(Optional<? extends PhoneNumber> phoneNumber) {
             Utils.checkNotNull(phoneNumber, "phoneNumber");
             this.phoneNumber = phoneNumber;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateProductionInstanceDomainRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateProductionInstanceDomainRequestBody.java
index 92c9060..ee548ce 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateProductionInstanceDomainRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateProductionInstanceDomainRequestBody.java
@@ -4,20 +4,19 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class UpdateProductionInstanceDomainRequestBody {
 
     /**
@@ -25,11 +24,11 @@ public class UpdateProductionInstanceDomainRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("home_url")
-    private Optional<? extends String> homeUrl;
+    private Optional<String> homeUrl;
 
     @JsonCreator
     public UpdateProductionInstanceDomainRequestBody(
-            @JsonProperty("home_url") Optional<? extends String> homeUrl) {
+            @JsonProperty("home_url") Optional<String> homeUrl) {
         Utils.checkNotNull(homeUrl, "homeUrl");
         this.homeUrl = homeUrl;
     }
@@ -41,10 +40,9 @@ public UpdateProductionInstanceDomainRequestBody() {
     /**
      * The new home URL of the production instance e.g. https://www.example.com
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> homeUrl() {
-        return (Optional<String>) homeUrl;
+        return homeUrl;
     }
 
     public final static Builder builder() {
@@ -63,7 +61,7 @@ public UpdateProductionInstanceDomainRequestBody withHomeUrl(String homeUrl) {
     /**
      * The new home URL of the production instance e.g. https://www.example.com
      */
-    public UpdateProductionInstanceDomainRequestBody withHomeUrl(Optional<? extends String> homeUrl) {
+    public UpdateProductionInstanceDomainRequestBody withHomeUrl(Optional<String> homeUrl) {
         Utils.checkNotNull(homeUrl, "homeUrl");
         this.homeUrl = homeUrl;
         return this;
@@ -79,12 +77,12 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateProductionInstanceDomainRequestBody other = (UpdateProductionInstanceDomainRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.homeUrl, other.homeUrl);
+            Objects.deepEquals(this.homeUrl, other.homeUrl);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             homeUrl);
     }
     
@@ -96,7 +94,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> homeUrl = Optional.empty();  
+        private Optional<String> homeUrl = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -114,7 +112,7 @@ public Builder homeUrl(String homeUrl) {
         /**
          * The new home URL of the production instance e.g. https://www.example.com
          */
-        public Builder homeUrl(Optional<? extends String> homeUrl) {
+        public Builder homeUrl(Optional<String> homeUrl) {
             Utils.checkNotNull(homeUrl, "homeUrl");
             this.homeUrl = homeUrl;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateProductionInstanceDomainRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateProductionInstanceDomainRequestBuilder.java
index 6f41624..86423dc 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateProductionInstanceDomainRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateProductionInstanceDomainRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class UpdateProductionInstanceDomainRequestBuilder {
 
@@ -26,13 +16,13 @@ public UpdateProductionInstanceDomainRequestBuilder(SDKMethodInterfaces.MethodCa
         this.sdk = sdk;
     }
                 
-    public UpdateProductionInstanceDomainRequestBuilder request(UpdateProductionInstanceDomainRequestBody request) {
+    public UpdateProductionInstanceDomainRequestBuilder request(com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public UpdateProductionInstanceDomainRequestBuilder request(Optional<? extends UpdateProductionInstanceDomainRequestBody> request) {
+    public UpdateProductionInstanceDomainRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.UpdateProductionInstanceDomainRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateProductionInstanceDomainResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateProductionInstanceDomainResponse.java
index 3a83cbc..bf99f94 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateProductionInstanceDomainResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateProductionInstanceDomainResponse.java
@@ -4,18 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
 import java.net.http.HttpResponse;
+import java.util.Objects;
+
 
-public class UpdateProductionInstanceDomainResponse implements com.clerk.backend_api.utils.Response {
+public class UpdateProductionInstanceDomainResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -110,14 +112,14 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateProductionInstanceDomainResponse other = (UpdateProductionInstanceDomainResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse);
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionAttributeMapping.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionAttributeMapping.java
index ddb3f5f..966f44c 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionAttributeMapping.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionAttributeMapping.java
@@ -4,19 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
+
 /**
  * UpdateSAMLConnectionAttributeMapping - Define the atrtibute name mapping between Identity Provider and Clerk's user properties
  */
@@ -25,26 +24,26 @@ public class UpdateSAMLConnectionAttributeMapping {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("user_id")
-    private Optional<? extends String> userId;
+    private Optional<String> userId;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("email_address")
-    private Optional<? extends String> emailAddress;
+    private Optional<String> emailAddress;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("first_name")
-    private Optional<? extends String> firstName;
+    private Optional<String> firstName;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("last_name")
-    private Optional<? extends String> lastName;
+    private Optional<String> lastName;
 
     @JsonCreator
     public UpdateSAMLConnectionAttributeMapping(
-            @JsonProperty("user_id") Optional<? extends String> userId,
-            @JsonProperty("email_address") Optional<? extends String> emailAddress,
-            @JsonProperty("first_name") Optional<? extends String> firstName,
-            @JsonProperty("last_name") Optional<? extends String> lastName) {
+            @JsonProperty("user_id") Optional<String> userId,
+            @JsonProperty("email_address") Optional<String> emailAddress,
+            @JsonProperty("first_name") Optional<String> firstName,
+            @JsonProperty("last_name") Optional<String> lastName) {
         Utils.checkNotNull(userId, "userId");
         Utils.checkNotNull(emailAddress, "emailAddress");
         Utils.checkNotNull(firstName, "firstName");
@@ -59,28 +58,24 @@ public UpdateSAMLConnectionAttributeMapping() {
         this(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> userId() {
-        return (Optional<String>) userId;
+        return userId;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> emailAddress() {
-        return (Optional<String>) emailAddress;
+        return emailAddress;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> firstName() {
-        return (Optional<String>) firstName;
+        return firstName;
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> lastName() {
-        return (Optional<String>) lastName;
+        return lastName;
     }
 
     public final static Builder builder() {
@@ -93,7 +88,7 @@ public UpdateSAMLConnectionAttributeMapping withUserId(String userId) {
         return this;
     }
 
-    public UpdateSAMLConnectionAttributeMapping withUserId(Optional<? extends String> userId) {
+    public UpdateSAMLConnectionAttributeMapping withUserId(Optional<String> userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
@@ -105,7 +100,7 @@ public UpdateSAMLConnectionAttributeMapping withEmailAddress(String emailAddress
         return this;
     }
 
-    public UpdateSAMLConnectionAttributeMapping withEmailAddress(Optional<? extends String> emailAddress) {
+    public UpdateSAMLConnectionAttributeMapping withEmailAddress(Optional<String> emailAddress) {
         Utils.checkNotNull(emailAddress, "emailAddress");
         this.emailAddress = emailAddress;
         return this;
@@ -117,7 +112,7 @@ public UpdateSAMLConnectionAttributeMapping withFirstName(String firstName) {
         return this;
     }
 
-    public UpdateSAMLConnectionAttributeMapping withFirstName(Optional<? extends String> firstName) {
+    public UpdateSAMLConnectionAttributeMapping withFirstName(Optional<String> firstName) {
         Utils.checkNotNull(firstName, "firstName");
         this.firstName = firstName;
         return this;
@@ -129,7 +124,7 @@ public UpdateSAMLConnectionAttributeMapping withLastName(String lastName) {
         return this;
     }
 
-    public UpdateSAMLConnectionAttributeMapping withLastName(Optional<? extends String> lastName) {
+    public UpdateSAMLConnectionAttributeMapping withLastName(Optional<String> lastName) {
         Utils.checkNotNull(lastName, "lastName");
         this.lastName = lastName;
         return this;
@@ -145,15 +140,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateSAMLConnectionAttributeMapping other = (UpdateSAMLConnectionAttributeMapping) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.emailAddress, other.emailAddress) &&
-            java.util.Objects.deepEquals(this.firstName, other.firstName) &&
-            java.util.Objects.deepEquals(this.lastName, other.lastName);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.emailAddress, other.emailAddress) &&
+            Objects.deepEquals(this.firstName, other.firstName) &&
+            Objects.deepEquals(this.lastName, other.lastName);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             emailAddress,
             firstName,
@@ -171,13 +166,13 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> userId = Optional.empty();
+        private Optional<String> userId = Optional.empty();
  
-        private Optional<? extends String> emailAddress = Optional.empty();
+        private Optional<String> emailAddress = Optional.empty();
  
-        private Optional<? extends String> firstName = Optional.empty();
+        private Optional<String> firstName = Optional.empty();
  
-        private Optional<? extends String> lastName = Optional.empty();  
+        private Optional<String> lastName = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -189,7 +184,7 @@ public Builder userId(String userId) {
             return this;
         }
 
-        public Builder userId(Optional<? extends String> userId) {
+        public Builder userId(Optional<String> userId) {
             Utils.checkNotNull(userId, "userId");
             this.userId = userId;
             return this;
@@ -201,7 +196,7 @@ public Builder emailAddress(String emailAddress) {
             return this;
         }
 
-        public Builder emailAddress(Optional<? extends String> emailAddress) {
+        public Builder emailAddress(Optional<String> emailAddress) {
             Utils.checkNotNull(emailAddress, "emailAddress");
             this.emailAddress = emailAddress;
             return this;
@@ -213,7 +208,7 @@ public Builder firstName(String firstName) {
             return this;
         }
 
-        public Builder firstName(Optional<? extends String> firstName) {
+        public Builder firstName(Optional<String> firstName) {
             Utils.checkNotNull(firstName, "firstName");
             this.firstName = firstName;
             return this;
@@ -225,7 +220,7 @@ public Builder lastName(String lastName) {
             return this;
         }
 
-        public Builder lastName(Optional<? extends String> lastName) {
+        public Builder lastName(Optional<String> lastName) {
             Utils.checkNotNull(lastName, "lastName");
             this.lastName = lastName;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionRequest.java
index ebe6dd3..fc45317 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class UpdateSAMLConnectionRequest {
 
@@ -78,13 +77,13 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateSAMLConnectionRequest other = (UpdateSAMLConnectionRequest) o;
         return 
-            java.util.Objects.deepEquals(this.samlConnectionId, other.samlConnectionId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.samlConnectionId, other.samlConnectionId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             samlConnectionId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionRequestBody.java
index 922fef8..be84fef 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionRequestBody.java
@@ -4,20 +4,21 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class UpdateSAMLConnectionRequestBody {
 
     /**
@@ -25,49 +26,49 @@ public class UpdateSAMLConnectionRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("name")
-    private JsonNullable<? extends String> name;
+    private JsonNullable<String> name;
 
     /**
      * The domain to use for the new SAML Connection
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("domain")
-    private JsonNullable<? extends String> domain;
+    private JsonNullable<String> domain;
 
     /**
      * The entity id as provided by the IdP
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("idp_entity_id")
-    private JsonNullable<? extends String> idpEntityId;
+    private JsonNullable<String> idpEntityId;
 
     /**
      * The SSO url as provided by the IdP
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("idp_sso_url")
-    private JsonNullable<? extends String> idpSsoUrl;
+    private JsonNullable<String> idpSsoUrl;
 
     /**
      * The x509 certificated as provided by the IdP
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("idp_certificate")
-    private JsonNullable<? extends String> idpCertificate;
+    private JsonNullable<String> idpCertificate;
 
     /**
      * The URL which serves the IdP metadata. If present, it takes priority over the corresponding individual properties and replaces them
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("idp_metadata_url")
-    private JsonNullable<? extends String> idpMetadataUrl;
+    private JsonNullable<String> idpMetadataUrl;
 
     /**
      * The XML content of the IdP metadata file. If present, it takes priority over the corresponding individual properties
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("idp_metadata")
-    private JsonNullable<? extends String> idpMetadata;
+    private JsonNullable<String> idpMetadata;
 
     /**
      * Define the atrtibute name mapping between Identity Provider and Clerk's user properties
@@ -81,43 +82,43 @@ public class UpdateSAMLConnectionRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("active")
-    private JsonNullable<? extends Boolean> active;
+    private JsonNullable<Boolean> active;
 
     /**
      * Controls whether to update the user's attributes in each sign-in
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("sync_user_attributes")
-    private JsonNullable<? extends Boolean> syncUserAttributes;
+    private JsonNullable<Boolean> syncUserAttributes;
 
     /**
      * Allow users with an email address subdomain to use this connection in order to authenticate
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("allow_subdomains")
-    private JsonNullable<? extends Boolean> allowSubdomains;
+    private JsonNullable<Boolean> allowSubdomains;
 
     /**
      * Enable or deactivate IdP-initiated flows
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("allow_idp_initiated")
-    private JsonNullable<? extends Boolean> allowIdpInitiated;
+    private JsonNullable<Boolean> allowIdpInitiated;
 
     @JsonCreator
     public UpdateSAMLConnectionRequestBody(
-            @JsonProperty("name") JsonNullable<? extends String> name,
-            @JsonProperty("domain") JsonNullable<? extends String> domain,
-            @JsonProperty("idp_entity_id") JsonNullable<? extends String> idpEntityId,
-            @JsonProperty("idp_sso_url") JsonNullable<? extends String> idpSsoUrl,
-            @JsonProperty("idp_certificate") JsonNullable<? extends String> idpCertificate,
-            @JsonProperty("idp_metadata_url") JsonNullable<? extends String> idpMetadataUrl,
-            @JsonProperty("idp_metadata") JsonNullable<? extends String> idpMetadata,
+            @JsonProperty("name") JsonNullable<String> name,
+            @JsonProperty("domain") JsonNullable<String> domain,
+            @JsonProperty("idp_entity_id") JsonNullable<String> idpEntityId,
+            @JsonProperty("idp_sso_url") JsonNullable<String> idpSsoUrl,
+            @JsonProperty("idp_certificate") JsonNullable<String> idpCertificate,
+            @JsonProperty("idp_metadata_url") JsonNullable<String> idpMetadataUrl,
+            @JsonProperty("idp_metadata") JsonNullable<String> idpMetadata,
             @JsonProperty("attribute_mapping") JsonNullable<? extends UpdateSAMLConnectionAttributeMapping> attributeMapping,
-            @JsonProperty("active") JsonNullable<? extends Boolean> active,
-            @JsonProperty("sync_user_attributes") JsonNullable<? extends Boolean> syncUserAttributes,
-            @JsonProperty("allow_subdomains") JsonNullable<? extends Boolean> allowSubdomains,
-            @JsonProperty("allow_idp_initiated") JsonNullable<? extends Boolean> allowIdpInitiated) {
+            @JsonProperty("active") JsonNullable<Boolean> active,
+            @JsonProperty("sync_user_attributes") JsonNullable<Boolean> syncUserAttributes,
+            @JsonProperty("allow_subdomains") JsonNullable<Boolean> allowSubdomains,
+            @JsonProperty("allow_idp_initiated") JsonNullable<Boolean> allowIdpInitiated) {
         Utils.checkNotNull(name, "name");
         Utils.checkNotNull(domain, "domain");
         Utils.checkNotNull(idpEntityId, "idpEntityId");
@@ -151,64 +152,57 @@ public UpdateSAMLConnectionRequestBody() {
     /**
      * The name of the new SAML Connection
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> name() {
-        return (JsonNullable<String>) name;
+        return name;
     }
 
     /**
      * The domain to use for the new SAML Connection
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> domain() {
-        return (JsonNullable<String>) domain;
+        return domain;
     }
 
     /**
      * The entity id as provided by the IdP
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> idpEntityId() {
-        return (JsonNullable<String>) idpEntityId;
+        return idpEntityId;
     }
 
     /**
      * The SSO url as provided by the IdP
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> idpSsoUrl() {
-        return (JsonNullable<String>) idpSsoUrl;
+        return idpSsoUrl;
     }
 
     /**
      * The x509 certificated as provided by the IdP
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> idpCertificate() {
-        return (JsonNullable<String>) idpCertificate;
+        return idpCertificate;
     }
 
     /**
      * The URL which serves the IdP metadata. If present, it takes priority over the corresponding individual properties and replaces them
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> idpMetadataUrl() {
-        return (JsonNullable<String>) idpMetadataUrl;
+        return idpMetadataUrl;
     }
 
     /**
      * The XML content of the IdP metadata file. If present, it takes priority over the corresponding individual properties
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> idpMetadata() {
-        return (JsonNullable<String>) idpMetadata;
+        return idpMetadata;
     }
 
     /**
@@ -223,37 +217,33 @@ public JsonNullable<UpdateSAMLConnectionAttributeMapping> attributeMapping() {
     /**
      * Activate or de-activate the SAML Connection
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> active() {
-        return (JsonNullable<Boolean>) active;
+        return active;
     }
 
     /**
      * Controls whether to update the user's attributes in each sign-in
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> syncUserAttributes() {
-        return (JsonNullable<Boolean>) syncUserAttributes;
+        return syncUserAttributes;
     }
 
     /**
      * Allow users with an email address subdomain to use this connection in order to authenticate
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> allowSubdomains() {
-        return (JsonNullable<Boolean>) allowSubdomains;
+        return allowSubdomains;
     }
 
     /**
      * Enable or deactivate IdP-initiated flows
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> allowIdpInitiated() {
-        return (JsonNullable<Boolean>) allowIdpInitiated;
+        return allowIdpInitiated;
     }
 
     public final static Builder builder() {
@@ -272,7 +262,7 @@ public UpdateSAMLConnectionRequestBody withName(String name) {
     /**
      * The name of the new SAML Connection
      */
-    public UpdateSAMLConnectionRequestBody withName(JsonNullable<? extends String> name) {
+    public UpdateSAMLConnectionRequestBody withName(JsonNullable<String> name) {
         Utils.checkNotNull(name, "name");
         this.name = name;
         return this;
@@ -290,7 +280,7 @@ public UpdateSAMLConnectionRequestBody withDomain(String domain) {
     /**
      * The domain to use for the new SAML Connection
      */
-    public UpdateSAMLConnectionRequestBody withDomain(JsonNullable<? extends String> domain) {
+    public UpdateSAMLConnectionRequestBody withDomain(JsonNullable<String> domain) {
         Utils.checkNotNull(domain, "domain");
         this.domain = domain;
         return this;
@@ -308,7 +298,7 @@ public UpdateSAMLConnectionRequestBody withIdpEntityId(String idpEntityId) {
     /**
      * The entity id as provided by the IdP
      */
-    public UpdateSAMLConnectionRequestBody withIdpEntityId(JsonNullable<? extends String> idpEntityId) {
+    public UpdateSAMLConnectionRequestBody withIdpEntityId(JsonNullable<String> idpEntityId) {
         Utils.checkNotNull(idpEntityId, "idpEntityId");
         this.idpEntityId = idpEntityId;
         return this;
@@ -326,7 +316,7 @@ public UpdateSAMLConnectionRequestBody withIdpSsoUrl(String idpSsoUrl) {
     /**
      * The SSO url as provided by the IdP
      */
-    public UpdateSAMLConnectionRequestBody withIdpSsoUrl(JsonNullable<? extends String> idpSsoUrl) {
+    public UpdateSAMLConnectionRequestBody withIdpSsoUrl(JsonNullable<String> idpSsoUrl) {
         Utils.checkNotNull(idpSsoUrl, "idpSsoUrl");
         this.idpSsoUrl = idpSsoUrl;
         return this;
@@ -344,7 +334,7 @@ public UpdateSAMLConnectionRequestBody withIdpCertificate(String idpCertificate)
     /**
      * The x509 certificated as provided by the IdP
      */
-    public UpdateSAMLConnectionRequestBody withIdpCertificate(JsonNullable<? extends String> idpCertificate) {
+    public UpdateSAMLConnectionRequestBody withIdpCertificate(JsonNullable<String> idpCertificate) {
         Utils.checkNotNull(idpCertificate, "idpCertificate");
         this.idpCertificate = idpCertificate;
         return this;
@@ -362,7 +352,7 @@ public UpdateSAMLConnectionRequestBody withIdpMetadataUrl(String idpMetadataUrl)
     /**
      * The URL which serves the IdP metadata. If present, it takes priority over the corresponding individual properties and replaces them
      */
-    public UpdateSAMLConnectionRequestBody withIdpMetadataUrl(JsonNullable<? extends String> idpMetadataUrl) {
+    public UpdateSAMLConnectionRequestBody withIdpMetadataUrl(JsonNullable<String> idpMetadataUrl) {
         Utils.checkNotNull(idpMetadataUrl, "idpMetadataUrl");
         this.idpMetadataUrl = idpMetadataUrl;
         return this;
@@ -380,7 +370,7 @@ public UpdateSAMLConnectionRequestBody withIdpMetadata(String idpMetadata) {
     /**
      * The XML content of the IdP metadata file. If present, it takes priority over the corresponding individual properties
      */
-    public UpdateSAMLConnectionRequestBody withIdpMetadata(JsonNullable<? extends String> idpMetadata) {
+    public UpdateSAMLConnectionRequestBody withIdpMetadata(JsonNullable<String> idpMetadata) {
         Utils.checkNotNull(idpMetadata, "idpMetadata");
         this.idpMetadata = idpMetadata;
         return this;
@@ -416,7 +406,7 @@ public UpdateSAMLConnectionRequestBody withActive(boolean active) {
     /**
      * Activate or de-activate the SAML Connection
      */
-    public UpdateSAMLConnectionRequestBody withActive(JsonNullable<? extends Boolean> active) {
+    public UpdateSAMLConnectionRequestBody withActive(JsonNullable<Boolean> active) {
         Utils.checkNotNull(active, "active");
         this.active = active;
         return this;
@@ -434,7 +424,7 @@ public UpdateSAMLConnectionRequestBody withSyncUserAttributes(boolean syncUserAt
     /**
      * Controls whether to update the user's attributes in each sign-in
      */
-    public UpdateSAMLConnectionRequestBody withSyncUserAttributes(JsonNullable<? extends Boolean> syncUserAttributes) {
+    public UpdateSAMLConnectionRequestBody withSyncUserAttributes(JsonNullable<Boolean> syncUserAttributes) {
         Utils.checkNotNull(syncUserAttributes, "syncUserAttributes");
         this.syncUserAttributes = syncUserAttributes;
         return this;
@@ -452,7 +442,7 @@ public UpdateSAMLConnectionRequestBody withAllowSubdomains(boolean allowSubdomai
     /**
      * Allow users with an email address subdomain to use this connection in order to authenticate
      */
-    public UpdateSAMLConnectionRequestBody withAllowSubdomains(JsonNullable<? extends Boolean> allowSubdomains) {
+    public UpdateSAMLConnectionRequestBody withAllowSubdomains(JsonNullable<Boolean> allowSubdomains) {
         Utils.checkNotNull(allowSubdomains, "allowSubdomains");
         this.allowSubdomains = allowSubdomains;
         return this;
@@ -470,7 +460,7 @@ public UpdateSAMLConnectionRequestBody withAllowIdpInitiated(boolean allowIdpIni
     /**
      * Enable or deactivate IdP-initiated flows
      */
-    public UpdateSAMLConnectionRequestBody withAllowIdpInitiated(JsonNullable<? extends Boolean> allowIdpInitiated) {
+    public UpdateSAMLConnectionRequestBody withAllowIdpInitiated(JsonNullable<Boolean> allowIdpInitiated) {
         Utils.checkNotNull(allowIdpInitiated, "allowIdpInitiated");
         this.allowIdpInitiated = allowIdpInitiated;
         return this;
@@ -486,23 +476,23 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateSAMLConnectionRequestBody other = (UpdateSAMLConnectionRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.domain, other.domain) &&
-            java.util.Objects.deepEquals(this.idpEntityId, other.idpEntityId) &&
-            java.util.Objects.deepEquals(this.idpSsoUrl, other.idpSsoUrl) &&
-            java.util.Objects.deepEquals(this.idpCertificate, other.idpCertificate) &&
-            java.util.Objects.deepEquals(this.idpMetadataUrl, other.idpMetadataUrl) &&
-            java.util.Objects.deepEquals(this.idpMetadata, other.idpMetadata) &&
-            java.util.Objects.deepEquals(this.attributeMapping, other.attributeMapping) &&
-            java.util.Objects.deepEquals(this.active, other.active) &&
-            java.util.Objects.deepEquals(this.syncUserAttributes, other.syncUserAttributes) &&
-            java.util.Objects.deepEquals(this.allowSubdomains, other.allowSubdomains) &&
-            java.util.Objects.deepEquals(this.allowIdpInitiated, other.allowIdpInitiated);
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.domain, other.domain) &&
+            Objects.deepEquals(this.idpEntityId, other.idpEntityId) &&
+            Objects.deepEquals(this.idpSsoUrl, other.idpSsoUrl) &&
+            Objects.deepEquals(this.idpCertificate, other.idpCertificate) &&
+            Objects.deepEquals(this.idpMetadataUrl, other.idpMetadataUrl) &&
+            Objects.deepEquals(this.idpMetadata, other.idpMetadata) &&
+            Objects.deepEquals(this.attributeMapping, other.attributeMapping) &&
+            Objects.deepEquals(this.active, other.active) &&
+            Objects.deepEquals(this.syncUserAttributes, other.syncUserAttributes) &&
+            Objects.deepEquals(this.allowSubdomains, other.allowSubdomains) &&
+            Objects.deepEquals(this.allowIdpInitiated, other.allowIdpInitiated);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             name,
             domain,
             idpEntityId,
@@ -536,29 +526,29 @@ public String toString() {
     
     public final static class Builder {
  
-        private JsonNullable<? extends String> name = JsonNullable.undefined();
+        private JsonNullable<String> name = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> domain = JsonNullable.undefined();
+        private JsonNullable<String> domain = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> idpEntityId = JsonNullable.undefined();
+        private JsonNullable<String> idpEntityId = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> idpSsoUrl = JsonNullable.undefined();
+        private JsonNullable<String> idpSsoUrl = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> idpCertificate = JsonNullable.undefined();
+        private JsonNullable<String> idpCertificate = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> idpMetadataUrl = JsonNullable.undefined();
+        private JsonNullable<String> idpMetadataUrl = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> idpMetadata = JsonNullable.undefined();
+        private JsonNullable<String> idpMetadata = JsonNullable.undefined();
  
         private JsonNullable<? extends UpdateSAMLConnectionAttributeMapping> attributeMapping = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> active = JsonNullable.undefined();
+        private JsonNullable<Boolean> active = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> syncUserAttributes = JsonNullable.undefined();
+        private JsonNullable<Boolean> syncUserAttributes = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> allowSubdomains = JsonNullable.undefined();
+        private JsonNullable<Boolean> allowSubdomains = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> allowIdpInitiated = JsonNullable.undefined();  
+        private JsonNullable<Boolean> allowIdpInitiated = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -576,7 +566,7 @@ public Builder name(String name) {
         /**
          * The name of the new SAML Connection
          */
-        public Builder name(JsonNullable<? extends String> name) {
+        public Builder name(JsonNullable<String> name) {
             Utils.checkNotNull(name, "name");
             this.name = name;
             return this;
@@ -594,7 +584,7 @@ public Builder domain(String domain) {
         /**
          * The domain to use for the new SAML Connection
          */
-        public Builder domain(JsonNullable<? extends String> domain) {
+        public Builder domain(JsonNullable<String> domain) {
             Utils.checkNotNull(domain, "domain");
             this.domain = domain;
             return this;
@@ -612,7 +602,7 @@ public Builder idpEntityId(String idpEntityId) {
         /**
          * The entity id as provided by the IdP
          */
-        public Builder idpEntityId(JsonNullable<? extends String> idpEntityId) {
+        public Builder idpEntityId(JsonNullable<String> idpEntityId) {
             Utils.checkNotNull(idpEntityId, "idpEntityId");
             this.idpEntityId = idpEntityId;
             return this;
@@ -630,7 +620,7 @@ public Builder idpSsoUrl(String idpSsoUrl) {
         /**
          * The SSO url as provided by the IdP
          */
-        public Builder idpSsoUrl(JsonNullable<? extends String> idpSsoUrl) {
+        public Builder idpSsoUrl(JsonNullable<String> idpSsoUrl) {
             Utils.checkNotNull(idpSsoUrl, "idpSsoUrl");
             this.idpSsoUrl = idpSsoUrl;
             return this;
@@ -648,7 +638,7 @@ public Builder idpCertificate(String idpCertificate) {
         /**
          * The x509 certificated as provided by the IdP
          */
-        public Builder idpCertificate(JsonNullable<? extends String> idpCertificate) {
+        public Builder idpCertificate(JsonNullable<String> idpCertificate) {
             Utils.checkNotNull(idpCertificate, "idpCertificate");
             this.idpCertificate = idpCertificate;
             return this;
@@ -666,7 +656,7 @@ public Builder idpMetadataUrl(String idpMetadataUrl) {
         /**
          * The URL which serves the IdP metadata. If present, it takes priority over the corresponding individual properties and replaces them
          */
-        public Builder idpMetadataUrl(JsonNullable<? extends String> idpMetadataUrl) {
+        public Builder idpMetadataUrl(JsonNullable<String> idpMetadataUrl) {
             Utils.checkNotNull(idpMetadataUrl, "idpMetadataUrl");
             this.idpMetadataUrl = idpMetadataUrl;
             return this;
@@ -684,7 +674,7 @@ public Builder idpMetadata(String idpMetadata) {
         /**
          * The XML content of the IdP metadata file. If present, it takes priority over the corresponding individual properties
          */
-        public Builder idpMetadata(JsonNullable<? extends String> idpMetadata) {
+        public Builder idpMetadata(JsonNullable<String> idpMetadata) {
             Utils.checkNotNull(idpMetadata, "idpMetadata");
             this.idpMetadata = idpMetadata;
             return this;
@@ -720,7 +710,7 @@ public Builder active(boolean active) {
         /**
          * Activate or de-activate the SAML Connection
          */
-        public Builder active(JsonNullable<? extends Boolean> active) {
+        public Builder active(JsonNullable<Boolean> active) {
             Utils.checkNotNull(active, "active");
             this.active = active;
             return this;
@@ -738,7 +728,7 @@ public Builder syncUserAttributes(boolean syncUserAttributes) {
         /**
          * Controls whether to update the user's attributes in each sign-in
          */
-        public Builder syncUserAttributes(JsonNullable<? extends Boolean> syncUserAttributes) {
+        public Builder syncUserAttributes(JsonNullable<Boolean> syncUserAttributes) {
             Utils.checkNotNull(syncUserAttributes, "syncUserAttributes");
             this.syncUserAttributes = syncUserAttributes;
             return this;
@@ -756,7 +746,7 @@ public Builder allowSubdomains(boolean allowSubdomains) {
         /**
          * Allow users with an email address subdomain to use this connection in order to authenticate
          */
-        public Builder allowSubdomains(JsonNullable<? extends Boolean> allowSubdomains) {
+        public Builder allowSubdomains(JsonNullable<Boolean> allowSubdomains) {
             Utils.checkNotNull(allowSubdomains, "allowSubdomains");
             this.allowSubdomains = allowSubdomains;
             return this;
@@ -774,7 +764,7 @@ public Builder allowIdpInitiated(boolean allowIdpInitiated) {
         /**
          * Enable or deactivate IdP-initiated flows
          */
-        public Builder allowIdpInitiated(JsonNullable<? extends Boolean> allowIdpInitiated) {
+        public Builder allowIdpInitiated(JsonNullable<Boolean> allowIdpInitiated) {
             Utils.checkNotNull(allowIdpInitiated, "allowIdpInitiated");
             this.allowIdpInitiated = allowIdpInitiated;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionRequestBuilder.java
index fccfdc3..6f25210 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class UpdateSAMLConnectionRequestBuilder {
 
@@ -27,13 +17,13 @@ public UpdateSAMLConnectionRequestBuilder(SDKMethodInterfaces.MethodCallUpdateSA
         this.sdk = sdk;
     }
 
-    public UpdateSAMLConnectionRequestBuilder samlConnectionId(String samlConnectionId) {
+    public UpdateSAMLConnectionRequestBuilder samlConnectionId(java.lang.String samlConnectionId) {
         Utils.checkNotNull(samlConnectionId, "samlConnectionId");
         this.samlConnectionId = samlConnectionId;
         return this;
     }
 
-    public UpdateSAMLConnectionRequestBuilder requestBody(UpdateSAMLConnectionRequestBody requestBody) {
+    public UpdateSAMLConnectionRequestBuilder requestBody(com.clerk.backend_api.models.operations.UpdateSAMLConnectionRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionResponse.java
index b403186..2aaf1a8 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateSAMLConnectionResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.SAMLConnection;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdateSAMLConnectionResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdateSAMLConnectionResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdateSAMLConnectionResponse implements com.clerk.backend_api.utils
     /**
      * A SAML Connection
      */
-    private Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection;
+    private Optional<? extends SAMLConnection> samlConnection;
 
     @JsonCreator
     public UpdateSAMLConnectionResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection) {
+            Optional<? extends SAMLConnection> samlConnection) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.SAMLConnection> samlConnection() {
-        return (Optional<com.clerk.backend_api.models.components.SAMLConnection>) samlConnection;
+    public Optional<SAMLConnection> samlConnection() {
+        return (Optional<SAMLConnection>) samlConnection;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdateSAMLConnectionResponse withRawResponse(HttpResponse<InputStream> ra
     /**
      * A SAML Connection
      */
-    public UpdateSAMLConnectionResponse withSAMLConnection(com.clerk.backend_api.models.components.SAMLConnection samlConnection) {
+    public UpdateSAMLConnectionResponse withSAMLConnection(SAMLConnection samlConnection) {
         Utils.checkNotNull(samlConnection, "samlConnection");
         this.samlConnection = Optional.ofNullable(samlConnection);
         return this;
@@ -137,7 +141,7 @@ public UpdateSAMLConnectionResponse withSAMLConnection(com.clerk.backend_api.mod
     /**
      * A SAML Connection
      */
-    public UpdateSAMLConnectionResponse withSAMLConnection(Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection) {
+    public UpdateSAMLConnectionResponse withSAMLConnection(Optional<? extends SAMLConnection> samlConnection) {
         Utils.checkNotNull(samlConnection, "samlConnection");
         this.samlConnection = samlConnection;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateSAMLConnectionResponse other = (UpdateSAMLConnectionResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.samlConnection, other.samlConnection);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.samlConnection, other.samlConnection);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection = Optional.empty();  
+        private Optional<? extends SAMLConnection> samlConnection = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A SAML Connection
          */
-        public Builder samlConnection(com.clerk.backend_api.models.components.SAMLConnection samlConnection) {
+        public Builder samlConnection(SAMLConnection samlConnection) {
             Utils.checkNotNull(samlConnection, "samlConnection");
             this.samlConnection = Optional.ofNullable(samlConnection);
             return this;
@@ -230,7 +234,7 @@ public Builder samlConnection(com.clerk.backend_api.models.components.SAMLConnec
         /**
          * A SAML Connection
          */
-        public Builder samlConnection(Optional<? extends com.clerk.backend_api.models.components.SAMLConnection> samlConnection) {
+        public Builder samlConnection(Optional<? extends SAMLConnection> samlConnection) {
             Utils.checkNotNull(samlConnection, "samlConnection");
             this.samlConnection = samlConnection;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpRequest.java
index 5618745..e71b6d4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpRequest.java
@@ -4,18 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class UpdateSignUpRequest {
 
     /**
@@ -91,13 +91,13 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateSignUpRequest other = (UpdateSignUpRequest) o;
         return 
-            java.util.Objects.deepEquals(this.id, other.id) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.id, other.id) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             id,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpRequestBody.java
index d60e6b3..847eb11 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpRequestBody.java
@@ -4,21 +4,21 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class UpdateSignUpRequestBody {
 
     /**
@@ -28,7 +28,7 @@ public class UpdateSignUpRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("custom_action")
-    private Optional<? extends Boolean> customAction;
+    private Optional<Boolean> customAction;
 
     /**
      * The ID of the guest attempting to sign up as used in your external systems or your previous authentication solution.
@@ -36,12 +36,12 @@ public class UpdateSignUpRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("external_id")
-    private JsonNullable<? extends String> externalId;
+    private JsonNullable<String> externalId;
 
     @JsonCreator
     public UpdateSignUpRequestBody(
-            @JsonProperty("custom_action") Optional<? extends Boolean> customAction,
-            @JsonProperty("external_id") JsonNullable<? extends String> externalId) {
+            @JsonProperty("custom_action") Optional<Boolean> customAction,
+            @JsonProperty("external_id") JsonNullable<String> externalId) {
         Utils.checkNotNull(customAction, "customAction");
         Utils.checkNotNull(externalId, "externalId");
         this.customAction = customAction;
@@ -57,20 +57,18 @@ public UpdateSignUpRequestBody() {
      * This is important when your instance has been configured to require a custom action to run before converting a sign-up into a user.
      * After executing any external business logic you deem necessary, you can mark the sign-up as ready-to-convert by setting `custom_action` to `true`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> customAction() {
-        return (Optional<Boolean>) customAction;
+        return customAction;
     }
 
     /**
      * The ID of the guest attempting to sign up as used in your external systems or your previous authentication solution.
      * This will be copied to the resulting user when the sign-up is completed.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> externalId() {
-        return (JsonNullable<String>) externalId;
+        return externalId;
     }
 
     public final static Builder builder() {
@@ -93,7 +91,7 @@ public UpdateSignUpRequestBody withCustomAction(boolean customAction) {
      * This is important when your instance has been configured to require a custom action to run before converting a sign-up into a user.
      * After executing any external business logic you deem necessary, you can mark the sign-up as ready-to-convert by setting `custom_action` to `true`.
      */
-    public UpdateSignUpRequestBody withCustomAction(Optional<? extends Boolean> customAction) {
+    public UpdateSignUpRequestBody withCustomAction(Optional<Boolean> customAction) {
         Utils.checkNotNull(customAction, "customAction");
         this.customAction = customAction;
         return this;
@@ -113,7 +111,7 @@ public UpdateSignUpRequestBody withExternalId(String externalId) {
      * The ID of the guest attempting to sign up as used in your external systems or your previous authentication solution.
      * This will be copied to the resulting user when the sign-up is completed.
      */
-    public UpdateSignUpRequestBody withExternalId(JsonNullable<? extends String> externalId) {
+    public UpdateSignUpRequestBody withExternalId(JsonNullable<String> externalId) {
         Utils.checkNotNull(externalId, "externalId");
         this.externalId = externalId;
         return this;
@@ -129,13 +127,13 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateSignUpRequestBody other = (UpdateSignUpRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.customAction, other.customAction) &&
-            java.util.Objects.deepEquals(this.externalId, other.externalId);
+            Objects.deepEquals(this.customAction, other.customAction) &&
+            Objects.deepEquals(this.externalId, other.externalId);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             customAction,
             externalId);
     }
@@ -149,9 +147,9 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends Boolean> customAction = Optional.empty();
+        private Optional<Boolean> customAction = Optional.empty();
  
-        private JsonNullable<? extends String> externalId = JsonNullable.undefined();  
+        private JsonNullable<String> externalId = JsonNullable.undefined();  
         
         private Builder() {
           // force use of static builder() method
@@ -173,7 +171,7 @@ public Builder customAction(boolean customAction) {
          * This is important when your instance has been configured to require a custom action to run before converting a sign-up into a user.
          * After executing any external business logic you deem necessary, you can mark the sign-up as ready-to-convert by setting `custom_action` to `true`.
          */
-        public Builder customAction(Optional<? extends Boolean> customAction) {
+        public Builder customAction(Optional<Boolean> customAction) {
             Utils.checkNotNull(customAction, "customAction");
             this.customAction = customAction;
             return this;
@@ -193,7 +191,7 @@ public Builder externalId(String externalId) {
          * The ID of the guest attempting to sign up as used in your external systems or your previous authentication solution.
          * This will be copied to the resulting user when the sign-up is completed.
          */
-        public Builder externalId(JsonNullable<? extends String> externalId) {
+        public Builder externalId(JsonNullable<String> externalId) {
             Utils.checkNotNull(externalId, "externalId");
             this.externalId = externalId;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpRequestBuilder.java
index 6bcc84c..fc51edc 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpRequestBuilder.java
@@ -4,18 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.String;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class UpdateSignUpRequestBuilder {
 
@@ -27,19 +18,19 @@ public UpdateSignUpRequestBuilder(SDKMethodInterfaces.MethodCallUpdateSignUp sdk
         this.sdk = sdk;
     }
 
-    public UpdateSignUpRequestBuilder id(String id) {
+    public UpdateSignUpRequestBuilder id(java.lang.String id) {
         Utils.checkNotNull(id, "id");
         this.id = id;
         return this;
     }
                 
-    public UpdateSignUpRequestBuilder requestBody(UpdateSignUpRequestBody requestBody) {
+    public UpdateSignUpRequestBuilder requestBody(com.clerk.backend_api.models.operations.UpdateSignUpRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = Optional.of(requestBody);
         return this;
     }
 
-    public UpdateSignUpRequestBuilder requestBody(Optional<? extends UpdateSignUpRequestBody> requestBody) {
+    public UpdateSignUpRequestBuilder requestBody(java.util.Optional<? extends com.clerk.backend_api.models.operations.UpdateSignUpRequestBody> requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpResponse.java
index 8e596ba..e0001c9 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateSignUpResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.SignUp;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdateSignUpResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdateSignUpResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdateSignUpResponse implements com.clerk.backend_api.utils.Respons
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.SignUp> signUp;
+    private Optional<? extends SignUp> signUp;
 
     @JsonCreator
     public UpdateSignUpResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.SignUp> signUp) {
+            Optional<? extends SignUp> signUp) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.SignUp> signUp() {
-        return (Optional<com.clerk.backend_api.models.components.SignUp>) signUp;
+    public Optional<SignUp> signUp() {
+        return (Optional<SignUp>) signUp;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdateSignUpResponse withRawResponse(HttpResponse<InputStream> rawRespons
     /**
      * Success
      */
-    public UpdateSignUpResponse withSignUp(com.clerk.backend_api.models.components.SignUp signUp) {
+    public UpdateSignUpResponse withSignUp(SignUp signUp) {
         Utils.checkNotNull(signUp, "signUp");
         this.signUp = Optional.ofNullable(signUp);
         return this;
@@ -137,7 +141,7 @@ public UpdateSignUpResponse withSignUp(com.clerk.backend_api.models.components.S
     /**
      * Success
      */
-    public UpdateSignUpResponse withSignUp(Optional<? extends com.clerk.backend_api.models.components.SignUp> signUp) {
+    public UpdateSignUpResponse withSignUp(Optional<? extends SignUp> signUp) {
         Utils.checkNotNull(signUp, "signUp");
         this.signUp = signUp;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateSignUpResponse other = (UpdateSignUpResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.signUp, other.signUp);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.signUp, other.signUp);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.SignUp> signUp = Optional.empty();  
+        private Optional<? extends SignUp> signUp = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder signUp(com.clerk.backend_api.models.components.SignUp signUp) {
+        public Builder signUp(SignUp signUp) {
             Utils.checkNotNull(signUp, "signUp");
             this.signUp = Optional.ofNullable(signUp);
             return this;
@@ -230,7 +234,7 @@ public Builder signUp(com.clerk.backend_api.models.components.SignUp signUp) {
         /**
          * Success
          */
-        public Builder signUp(Optional<? extends com.clerk.backend_api.models.components.SignUp> signUp) {
+        public Builder signUp(Optional<? extends SignUp> signUp) {
             Utils.checkNotNull(signUp, "signUp");
             this.signUp = signUp;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataPrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataPrivateMetadata.java
index 35a9b1e..0b6b60d 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataPrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataPrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * UpdateUserMetadataPrivateMetadata - Metadata saved on the user that is only visible to your backend.
  * The new object will be merged with the existing value.
@@ -43,7 +41,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataPublicMetadata.java
index 49ad551..fdd39a3 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * UpdateUserMetadataPublicMetadata - Metadata saved on the user, that is visible to both your frontend and backend.
  * The new object will be merged with the existing value.
@@ -43,7 +41,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataRequest.java
index c4dbff7..536ed14 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataRequest.java
@@ -4,18 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class UpdateUserMetadataRequest {
 
     /**
@@ -91,13 +91,13 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateUserMetadataRequest other = (UpdateUserMetadataRequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataRequestBody.java
index 94b1ab8..3f91a06 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataRequestBody.java
@@ -4,20 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class UpdateUserMetadataRequestBody {
 
     /**
@@ -173,14 +173,14 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateUserMetadataRequestBody other = (UpdateUserMetadataRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
-            java.util.Objects.deepEquals(this.unsafeMetadata, other.unsafeMetadata);
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
+            Objects.deepEquals(this.unsafeMetadata, other.unsafeMetadata);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             publicMetadata,
             privateMetadata,
             unsafeMetadata);
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataRequestBuilder.java
index 3b09668..e0d2bfc 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataRequestBuilder.java
@@ -4,18 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.String;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class UpdateUserMetadataRequestBuilder {
 
@@ -27,19 +18,19 @@ public UpdateUserMetadataRequestBuilder(SDKMethodInterfaces.MethodCallUpdateUser
         this.sdk = sdk;
     }
 
-    public UpdateUserMetadataRequestBuilder userId(String userId) {
+    public UpdateUserMetadataRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
     }
                 
-    public UpdateUserMetadataRequestBuilder requestBody(UpdateUserMetadataRequestBody requestBody) {
+    public UpdateUserMetadataRequestBuilder requestBody(com.clerk.backend_api.models.operations.UpdateUserMetadataRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = Optional.of(requestBody);
         return this;
     }
 
-    public UpdateUserMetadataRequestBuilder requestBody(Optional<? extends UpdateUserMetadataRequestBody> requestBody) {
+    public UpdateUserMetadataRequestBuilder requestBody(java.util.Optional<? extends com.clerk.backend_api.models.operations.UpdateUserMetadataRequestBody> requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataResponse.java
index 4d45371..ed2f30f 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.User;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdateUserMetadataResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdateUserMetadataResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdateUserMetadataResponse implements com.clerk.backend_api.utils.R
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.User> user;
+    private Optional<? extends User> user;
 
     @JsonCreator
     public UpdateUserMetadataResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.User> user) {
+            Optional<? extends User> user) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.User> user() {
-        return (Optional<com.clerk.backend_api.models.components.User>) user;
+    public Optional<User> user() {
+        return (Optional<User>) user;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdateUserMetadataResponse withRawResponse(HttpResponse<InputStream> rawR
     /**
      * Success
      */
-    public UpdateUserMetadataResponse withUser(com.clerk.backend_api.models.components.User user) {
+    public UpdateUserMetadataResponse withUser(User user) {
         Utils.checkNotNull(user, "user");
         this.user = Optional.ofNullable(user);
         return this;
@@ -137,7 +141,7 @@ public UpdateUserMetadataResponse withUser(com.clerk.backend_api.models.componen
     /**
      * Success
      */
-    public UpdateUserMetadataResponse withUser(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+    public UpdateUserMetadataResponse withUser(Optional<? extends User> user) {
         Utils.checkNotNull(user, "user");
         this.user = user;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateUserMetadataResponse other = (UpdateUserMetadataResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.user, other.user);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.user, other.user);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.User> user = Optional.empty();  
+        private Optional<? extends User> user = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder user(com.clerk.backend_api.models.components.User user) {
+        public Builder user(User user) {
             Utils.checkNotNull(user, "user");
             this.user = Optional.ofNullable(user);
             return this;
@@ -230,7 +234,7 @@ public Builder user(com.clerk.backend_api.models.components.User user) {
         /**
          * Success
          */
-        public Builder user(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+        public Builder user(Optional<? extends User> user) {
             Utils.checkNotNull(user, "user");
             this.user = user;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataUnsafeMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataUnsafeMetadata.java
index d0b49c2..b055dad 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataUnsafeMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserMetadataUnsafeMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * UpdateUserMetadataUnsafeMetadata - Metadata saved on the user, that can be updated from both the Frontend and Backend APIs.
  * The new object will be merged with the existing value.
@@ -45,7 +43,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserPasswordHasher.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserPasswordHasher.java
index 1a9590d..dc03111 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserPasswordHasher.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserPasswordHasher.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * UpdateUserPasswordHasher - The hashing algorithm that was used to generate the password digest.
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserPrivateMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserPrivateMetadata.java
index 4080afa..419e6ce 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserPrivateMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserPrivateMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * UpdateUserPrivateMetadata - Metadata saved on the user, that is only visible to your Backend API
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserPublicMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserPublicMetadata.java
index 992d13e..7cafdff 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserPublicMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserPublicMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * UpdateUserPublicMetadata - Metadata saved on the user, that is visible to both your Frontend and Backend APIs
  */
@@ -42,7 +40,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserRequest.java
index 425c335..1b8fbb4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserRequest.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class UpdateUserRequest {
 
@@ -78,13 +77,13 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateUserRequest other = (UpdateUserRequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserRequestBody.java
index 337c445..8e5c4a4 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserRequestBody.java
@@ -4,22 +4,25 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class UpdateUserRequestBody {
 
     /**
@@ -28,21 +31,21 @@ public class UpdateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("external_id")
-    private JsonNullable<? extends String> externalId;
+    private JsonNullable<String> externalId;
 
     /**
      * The first name to assign to the user
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("first_name")
-    private JsonNullable<? extends String> firstName;
+    private JsonNullable<String> firstName;
 
     /**
      * The last name to assign to the user
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("last_name")
-    private JsonNullable<? extends String> lastName;
+    private JsonNullable<String> lastName;
 
     /**
      * The ID of the email address to set as primary.
@@ -50,7 +53,7 @@ public class UpdateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("primary_email_address_id")
-    private Optional<? extends String> primaryEmailAddressId;
+    private Optional<String> primaryEmailAddressId;
 
     /**
      * If set to `true`, the user will be notified that their primary email address has changed.
@@ -58,7 +61,7 @@ public class UpdateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("notify_primary_email_address_changed")
-    private Optional<? extends Boolean> notifyPrimaryEmailAddressChanged;
+    private Optional<Boolean> notifyPrimaryEmailAddressChanged;
 
     /**
      * The ID of the phone number to set as primary.
@@ -66,7 +69,7 @@ public class UpdateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("primary_phone_number_id")
-    private Optional<? extends String> primaryPhoneNumberId;
+    private Optional<String> primaryPhoneNumberId;
 
     /**
      * The ID of the web3 wallets to set as primary.
@@ -74,7 +77,7 @@ public class UpdateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("primary_web3_wallet_id")
-    private Optional<? extends String> primaryWeb3WalletId;
+    private Optional<String> primaryWeb3WalletId;
 
     /**
      * The username to give to the user.
@@ -82,14 +85,14 @@ public class UpdateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("username")
-    private JsonNullable<? extends String> username;
+    private JsonNullable<String> username;
 
     /**
      * The ID of the image to set as the user's profile image
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("profile_image_id")
-    private JsonNullable<? extends String> profileImageId;
+    private JsonNullable<String> profileImageId;
 
     /**
      * The plaintext password to give the user.
@@ -97,7 +100,7 @@ public class UpdateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("password")
-    private JsonNullable<? extends String> password;
+    private JsonNullable<String> password;
 
     /**
      * In case you already have the password digests and not the passwords, you can use them for the newly created user via this property.
@@ -106,7 +109,7 @@ public class UpdateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("password_digest")
-    private Optional<? extends String> passwordDigest;
+    private Optional<String> passwordDigest;
 
     /**
      * The hashing algorithm that was used to generate the password digest.
@@ -233,14 +236,14 @@ public class UpdateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("skip_password_checks")
-    private JsonNullable<? extends Boolean> skipPasswordChecks;
+    private JsonNullable<Boolean> skipPasswordChecks;
 
     /**
      * Set to `true` to sign out the user from all their active sessions once their password is updated. This parameter can only be used when providing a `password`.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("sign_out_of_other_sessions")
-    private JsonNullable<? extends Boolean> signOutOfOtherSessions;
+    private JsonNullable<Boolean> signOutOfOtherSessions;
 
     /**
      * In case TOTP is configured on the instance, you can provide the secret to enable it on the specific user without the need to reset it.
@@ -251,7 +254,7 @@ public class UpdateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("totp_secret")
-    private Optional<? extends String> totpSecret;
+    private Optional<String> totpSecret;
 
     /**
      * If Backup Codes are configured on the instance, you can provide them to enable it on the specific user without the need to reset them.
@@ -259,7 +262,7 @@ public class UpdateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("backup_codes")
-    private Optional<? extends java.util.List<String>> backupCodes;
+    private Optional<? extends List<String>> backupCodes;
 
     /**
      * Metadata saved on the user, that is visible to both your Frontend and Backend APIs
@@ -288,46 +291,46 @@ public class UpdateUserRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("delete_self_enabled")
-    private JsonNullable<? extends Boolean> deleteSelfEnabled;
+    private JsonNullable<Boolean> deleteSelfEnabled;
 
     /**
      * If true, the user can create organizations with the Frontend API.
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("create_organization_enabled")
-    private JsonNullable<? extends Boolean> createOrganizationEnabled;
+    private JsonNullable<Boolean> createOrganizationEnabled;
 
     /**
      * A custom date/time denoting _when_ the user signed up to the application, specified in RFC3339 format (e.g. `2012-10-20T07:15:20.902Z`).
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("created_at")
-    private Optional<? extends String> createdAt;
+    private Optional<String> createdAt;
 
     @JsonCreator
     public UpdateUserRequestBody(
-            @JsonProperty("external_id") JsonNullable<? extends String> externalId,
-            @JsonProperty("first_name") JsonNullable<? extends String> firstName,
-            @JsonProperty("last_name") JsonNullable<? extends String> lastName,
-            @JsonProperty("primary_email_address_id") Optional<? extends String> primaryEmailAddressId,
-            @JsonProperty("notify_primary_email_address_changed") Optional<? extends Boolean> notifyPrimaryEmailAddressChanged,
-            @JsonProperty("primary_phone_number_id") Optional<? extends String> primaryPhoneNumberId,
-            @JsonProperty("primary_web3_wallet_id") Optional<? extends String> primaryWeb3WalletId,
-            @JsonProperty("username") JsonNullable<? extends String> username,
-            @JsonProperty("profile_image_id") JsonNullable<? extends String> profileImageId,
-            @JsonProperty("password") JsonNullable<? extends String> password,
-            @JsonProperty("password_digest") Optional<? extends String> passwordDigest,
+            @JsonProperty("external_id") JsonNullable<String> externalId,
+            @JsonProperty("first_name") JsonNullable<String> firstName,
+            @JsonProperty("last_name") JsonNullable<String> lastName,
+            @JsonProperty("primary_email_address_id") Optional<String> primaryEmailAddressId,
+            @JsonProperty("notify_primary_email_address_changed") Optional<Boolean> notifyPrimaryEmailAddressChanged,
+            @JsonProperty("primary_phone_number_id") Optional<String> primaryPhoneNumberId,
+            @JsonProperty("primary_web3_wallet_id") Optional<String> primaryWeb3WalletId,
+            @JsonProperty("username") JsonNullable<String> username,
+            @JsonProperty("profile_image_id") JsonNullable<String> profileImageId,
+            @JsonProperty("password") JsonNullable<String> password,
+            @JsonProperty("password_digest") Optional<String> passwordDigest,
             @JsonProperty("password_hasher") Optional<? extends UpdateUserPasswordHasher> passwordHasher,
-            @JsonProperty("skip_password_checks") JsonNullable<? extends Boolean> skipPasswordChecks,
-            @JsonProperty("sign_out_of_other_sessions") JsonNullable<? extends Boolean> signOutOfOtherSessions,
-            @JsonProperty("totp_secret") Optional<? extends String> totpSecret,
-            @JsonProperty("backup_codes") Optional<? extends java.util.List<String>> backupCodes,
+            @JsonProperty("skip_password_checks") JsonNullable<Boolean> skipPasswordChecks,
+            @JsonProperty("sign_out_of_other_sessions") JsonNullable<Boolean> signOutOfOtherSessions,
+            @JsonProperty("totp_secret") Optional<String> totpSecret,
+            @JsonProperty("backup_codes") Optional<? extends List<String>> backupCodes,
             @JsonProperty("public_metadata") Optional<? extends UpdateUserPublicMetadata> publicMetadata,
             @JsonProperty("private_metadata") Optional<? extends UpdateUserPrivateMetadata> privateMetadata,
             @JsonProperty("unsafe_metadata") Optional<? extends UpdateUserUnsafeMetadata> unsafeMetadata,
-            @JsonProperty("delete_self_enabled") JsonNullable<? extends Boolean> deleteSelfEnabled,
-            @JsonProperty("create_organization_enabled") JsonNullable<? extends Boolean> createOrganizationEnabled,
-            @JsonProperty("created_at") Optional<? extends String> createdAt) {
+            @JsonProperty("delete_self_enabled") JsonNullable<Boolean> deleteSelfEnabled,
+            @JsonProperty("create_organization_enabled") JsonNullable<Boolean> createOrganizationEnabled,
+            @JsonProperty("created_at") Optional<String> createdAt) {
         Utils.checkNotNull(externalId, "externalId");
         Utils.checkNotNull(firstName, "firstName");
         Utils.checkNotNull(lastName, "lastName");
@@ -382,97 +385,87 @@ public UpdateUserRequestBody() {
      * The ID of the user as used in your external systems or your previous authentication solution.
      * Must be unique across your instance.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> externalId() {
-        return (JsonNullable<String>) externalId;
+        return externalId;
     }
 
     /**
      * The first name to assign to the user
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> firstName() {
-        return (JsonNullable<String>) firstName;
+        return firstName;
     }
 
     /**
      * The last name to assign to the user
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> lastName() {
-        return (JsonNullable<String>) lastName;
+        return lastName;
     }
 
     /**
      * The ID of the email address to set as primary.
      * It must be verified, and present on the current user.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> primaryEmailAddressId() {
-        return (Optional<String>) primaryEmailAddressId;
+        return primaryEmailAddressId;
     }
 
     /**
      * If set to `true`, the user will be notified that their primary email address has changed.
      * By default, no notification is sent.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> notifyPrimaryEmailAddressChanged() {
-        return (Optional<Boolean>) notifyPrimaryEmailAddressChanged;
+        return notifyPrimaryEmailAddressChanged;
     }
 
     /**
      * The ID of the phone number to set as primary.
      * It must be verified, and present on the current user.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> primaryPhoneNumberId() {
-        return (Optional<String>) primaryPhoneNumberId;
+        return primaryPhoneNumberId;
     }
 
     /**
      * The ID of the web3 wallets to set as primary.
      * It must be verified, and present on the current user.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> primaryWeb3WalletId() {
-        return (Optional<String>) primaryWeb3WalletId;
+        return primaryWeb3WalletId;
     }
 
     /**
      * The username to give to the user.
      * It must be unique across your instance.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> username() {
-        return (JsonNullable<String>) username;
+        return username;
     }
 
     /**
      * The ID of the image to set as the user's profile image
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> profileImageId() {
-        return (JsonNullable<String>) profileImageId;
+        return profileImageId;
     }
 
     /**
      * The plaintext password to give the user.
      * Must be at least 8 characters long, and can not be in any list of hacked passwords.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> password() {
-        return (JsonNullable<String>) password;
+        return password;
     }
 
     /**
@@ -480,10 +473,9 @@ public JsonNullable<String> password() {
      * The digests should be generated with one of the supported algorithms.
      * The hashing algorithm can be specified using the `password_hasher` property.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> passwordDigest() {
-        return (Optional<String>) passwordDigest;
+        return passwordDigest;
     }
 
     /**
@@ -611,19 +603,17 @@ public Optional<UpdateUserPasswordHasher> passwordHasher() {
     /**
      * Set it to `true` if you're updating the user's password and want to skip any password policy settings check. This parameter can only be used when providing a `password`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> skipPasswordChecks() {
-        return (JsonNullable<Boolean>) skipPasswordChecks;
+        return skipPasswordChecks;
     }
 
     /**
      * Set to `true` to sign out the user from all their active sessions once their password is updated. This parameter can only be used when providing a `password`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> signOutOfOtherSessions() {
-        return (JsonNullable<Boolean>) signOutOfOtherSessions;
+        return signOutOfOtherSessions;
     }
 
     /**
@@ -633,10 +623,9 @@ public JsonNullable<Boolean> signOutOfOtherSessions() {
      * * Code length: 6 digits
      * * Algorithm: SHA1
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> totpSecret() {
-        return (Optional<String>) totpSecret;
+        return totpSecret;
     }
 
     /**
@@ -645,8 +634,8 @@ public Optional<String> totpSecret() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<java.util.List<String>> backupCodes() {
-        return (Optional<java.util.List<String>>) backupCodes;
+    public Optional<List<String>> backupCodes() {
+        return (Optional<List<String>>) backupCodes;
     }
 
     /**
@@ -680,28 +669,25 @@ public Optional<UpdateUserUnsafeMetadata> unsafeMetadata() {
     /**
      * If true, the user can delete themselves with the Frontend API.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> deleteSelfEnabled() {
-        return (JsonNullable<Boolean>) deleteSelfEnabled;
+        return deleteSelfEnabled;
     }
 
     /**
      * If true, the user can create organizations with the Frontend API.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> createOrganizationEnabled() {
-        return (JsonNullable<Boolean>) createOrganizationEnabled;
+        return createOrganizationEnabled;
     }
 
     /**
      * A custom date/time denoting _when_ the user signed up to the application, specified in RFC3339 format (e.g. `2012-10-20T07:15:20.902Z`).
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> createdAt() {
-        return (Optional<String>) createdAt;
+        return createdAt;
     }
 
     public final static Builder builder() {
@@ -722,7 +708,7 @@ public UpdateUserRequestBody withExternalId(String externalId) {
      * The ID of the user as used in your external systems or your previous authentication solution.
      * Must be unique across your instance.
      */
-    public UpdateUserRequestBody withExternalId(JsonNullable<? extends String> externalId) {
+    public UpdateUserRequestBody withExternalId(JsonNullable<String> externalId) {
         Utils.checkNotNull(externalId, "externalId");
         this.externalId = externalId;
         return this;
@@ -740,7 +726,7 @@ public UpdateUserRequestBody withFirstName(String firstName) {
     /**
      * The first name to assign to the user
      */
-    public UpdateUserRequestBody withFirstName(JsonNullable<? extends String> firstName) {
+    public UpdateUserRequestBody withFirstName(JsonNullable<String> firstName) {
         Utils.checkNotNull(firstName, "firstName");
         this.firstName = firstName;
         return this;
@@ -758,7 +744,7 @@ public UpdateUserRequestBody withLastName(String lastName) {
     /**
      * The last name to assign to the user
      */
-    public UpdateUserRequestBody withLastName(JsonNullable<? extends String> lastName) {
+    public UpdateUserRequestBody withLastName(JsonNullable<String> lastName) {
         Utils.checkNotNull(lastName, "lastName");
         this.lastName = lastName;
         return this;
@@ -778,7 +764,7 @@ public UpdateUserRequestBody withPrimaryEmailAddressId(String primaryEmailAddres
      * The ID of the email address to set as primary.
      * It must be verified, and present on the current user.
      */
-    public UpdateUserRequestBody withPrimaryEmailAddressId(Optional<? extends String> primaryEmailAddressId) {
+    public UpdateUserRequestBody withPrimaryEmailAddressId(Optional<String> primaryEmailAddressId) {
         Utils.checkNotNull(primaryEmailAddressId, "primaryEmailAddressId");
         this.primaryEmailAddressId = primaryEmailAddressId;
         return this;
@@ -798,7 +784,7 @@ public UpdateUserRequestBody withNotifyPrimaryEmailAddressChanged(boolean notify
      * If set to `true`, the user will be notified that their primary email address has changed.
      * By default, no notification is sent.
      */
-    public UpdateUserRequestBody withNotifyPrimaryEmailAddressChanged(Optional<? extends Boolean> notifyPrimaryEmailAddressChanged) {
+    public UpdateUserRequestBody withNotifyPrimaryEmailAddressChanged(Optional<Boolean> notifyPrimaryEmailAddressChanged) {
         Utils.checkNotNull(notifyPrimaryEmailAddressChanged, "notifyPrimaryEmailAddressChanged");
         this.notifyPrimaryEmailAddressChanged = notifyPrimaryEmailAddressChanged;
         return this;
@@ -818,7 +804,7 @@ public UpdateUserRequestBody withPrimaryPhoneNumberId(String primaryPhoneNumberI
      * The ID of the phone number to set as primary.
      * It must be verified, and present on the current user.
      */
-    public UpdateUserRequestBody withPrimaryPhoneNumberId(Optional<? extends String> primaryPhoneNumberId) {
+    public UpdateUserRequestBody withPrimaryPhoneNumberId(Optional<String> primaryPhoneNumberId) {
         Utils.checkNotNull(primaryPhoneNumberId, "primaryPhoneNumberId");
         this.primaryPhoneNumberId = primaryPhoneNumberId;
         return this;
@@ -838,7 +824,7 @@ public UpdateUserRequestBody withPrimaryWeb3WalletId(String primaryWeb3WalletId)
      * The ID of the web3 wallets to set as primary.
      * It must be verified, and present on the current user.
      */
-    public UpdateUserRequestBody withPrimaryWeb3WalletId(Optional<? extends String> primaryWeb3WalletId) {
+    public UpdateUserRequestBody withPrimaryWeb3WalletId(Optional<String> primaryWeb3WalletId) {
         Utils.checkNotNull(primaryWeb3WalletId, "primaryWeb3WalletId");
         this.primaryWeb3WalletId = primaryWeb3WalletId;
         return this;
@@ -858,7 +844,7 @@ public UpdateUserRequestBody withUsername(String username) {
      * The username to give to the user.
      * It must be unique across your instance.
      */
-    public UpdateUserRequestBody withUsername(JsonNullable<? extends String> username) {
+    public UpdateUserRequestBody withUsername(JsonNullable<String> username) {
         Utils.checkNotNull(username, "username");
         this.username = username;
         return this;
@@ -876,7 +862,7 @@ public UpdateUserRequestBody withProfileImageId(String profileImageId) {
     /**
      * The ID of the image to set as the user's profile image
      */
-    public UpdateUserRequestBody withProfileImageId(JsonNullable<? extends String> profileImageId) {
+    public UpdateUserRequestBody withProfileImageId(JsonNullable<String> profileImageId) {
         Utils.checkNotNull(profileImageId, "profileImageId");
         this.profileImageId = profileImageId;
         return this;
@@ -896,7 +882,7 @@ public UpdateUserRequestBody withPassword(String password) {
      * The plaintext password to give the user.
      * Must be at least 8 characters long, and can not be in any list of hacked passwords.
      */
-    public UpdateUserRequestBody withPassword(JsonNullable<? extends String> password) {
+    public UpdateUserRequestBody withPassword(JsonNullable<String> password) {
         Utils.checkNotNull(password, "password");
         this.password = password;
         return this;
@@ -918,7 +904,7 @@ public UpdateUserRequestBody withPasswordDigest(String passwordDigest) {
      * The digests should be generated with one of the supported algorithms.
      * The hashing algorithm can be specified using the `password_hasher` property.
      */
-    public UpdateUserRequestBody withPasswordDigest(Optional<? extends String> passwordDigest) {
+    public UpdateUserRequestBody withPasswordDigest(Optional<String> passwordDigest) {
         Utils.checkNotNull(passwordDigest, "passwordDigest");
         this.passwordDigest = passwordDigest;
         return this;
@@ -1180,7 +1166,7 @@ public UpdateUserRequestBody withSkipPasswordChecks(boolean skipPasswordChecks)
     /**
      * Set it to `true` if you're updating the user's password and want to skip any password policy settings check. This parameter can only be used when providing a `password`.
      */
-    public UpdateUserRequestBody withSkipPasswordChecks(JsonNullable<? extends Boolean> skipPasswordChecks) {
+    public UpdateUserRequestBody withSkipPasswordChecks(JsonNullable<Boolean> skipPasswordChecks) {
         Utils.checkNotNull(skipPasswordChecks, "skipPasswordChecks");
         this.skipPasswordChecks = skipPasswordChecks;
         return this;
@@ -1198,7 +1184,7 @@ public UpdateUserRequestBody withSignOutOfOtherSessions(boolean signOutOfOtherSe
     /**
      * Set to `true` to sign out the user from all their active sessions once their password is updated. This parameter can only be used when providing a `password`.
      */
-    public UpdateUserRequestBody withSignOutOfOtherSessions(JsonNullable<? extends Boolean> signOutOfOtherSessions) {
+    public UpdateUserRequestBody withSignOutOfOtherSessions(JsonNullable<Boolean> signOutOfOtherSessions) {
         Utils.checkNotNull(signOutOfOtherSessions, "signOutOfOtherSessions");
         this.signOutOfOtherSessions = signOutOfOtherSessions;
         return this;
@@ -1224,7 +1210,7 @@ public UpdateUserRequestBody withTotpSecret(String totpSecret) {
      * * Code length: 6 digits
      * * Algorithm: SHA1
      */
-    public UpdateUserRequestBody withTotpSecret(Optional<? extends String> totpSecret) {
+    public UpdateUserRequestBody withTotpSecret(Optional<String> totpSecret) {
         Utils.checkNotNull(totpSecret, "totpSecret");
         this.totpSecret = totpSecret;
         return this;
@@ -1234,7 +1220,7 @@ public UpdateUserRequestBody withTotpSecret(Optional<? extends String> totpSecre
      * If Backup Codes are configured on the instance, you can provide them to enable it on the specific user without the need to reset them.
      * You must provide the backup codes in plain format or the corresponding bcrypt digest.
      */
-    public UpdateUserRequestBody withBackupCodes(java.util.List<String> backupCodes) {
+    public UpdateUserRequestBody withBackupCodes(List<String> backupCodes) {
         Utils.checkNotNull(backupCodes, "backupCodes");
         this.backupCodes = Optional.ofNullable(backupCodes);
         return this;
@@ -1244,7 +1230,7 @@ public UpdateUserRequestBody withBackupCodes(java.util.List<String> backupCodes)
      * If Backup Codes are configured on the instance, you can provide them to enable it on the specific user without the need to reset them.
      * You must provide the backup codes in plain format or the corresponding bcrypt digest.
      */
-    public UpdateUserRequestBody withBackupCodes(Optional<? extends java.util.List<String>> backupCodes) {
+    public UpdateUserRequestBody withBackupCodes(Optional<? extends List<String>> backupCodes) {
         Utils.checkNotNull(backupCodes, "backupCodes");
         this.backupCodes = backupCodes;
         return this;
@@ -1318,7 +1304,7 @@ public UpdateUserRequestBody withDeleteSelfEnabled(boolean deleteSelfEnabled) {
     /**
      * If true, the user can delete themselves with the Frontend API.
      */
-    public UpdateUserRequestBody withDeleteSelfEnabled(JsonNullable<? extends Boolean> deleteSelfEnabled) {
+    public UpdateUserRequestBody withDeleteSelfEnabled(JsonNullable<Boolean> deleteSelfEnabled) {
         Utils.checkNotNull(deleteSelfEnabled, "deleteSelfEnabled");
         this.deleteSelfEnabled = deleteSelfEnabled;
         return this;
@@ -1336,7 +1322,7 @@ public UpdateUserRequestBody withCreateOrganizationEnabled(boolean createOrganiz
     /**
      * If true, the user can create organizations with the Frontend API.
      */
-    public UpdateUserRequestBody withCreateOrganizationEnabled(JsonNullable<? extends Boolean> createOrganizationEnabled) {
+    public UpdateUserRequestBody withCreateOrganizationEnabled(JsonNullable<Boolean> createOrganizationEnabled) {
         Utils.checkNotNull(createOrganizationEnabled, "createOrganizationEnabled");
         this.createOrganizationEnabled = createOrganizationEnabled;
         return this;
@@ -1354,7 +1340,7 @@ public UpdateUserRequestBody withCreatedAt(String createdAt) {
     /**
      * A custom date/time denoting _when_ the user signed up to the application, specified in RFC3339 format (e.g. `2012-10-20T07:15:20.902Z`).
      */
-    public UpdateUserRequestBody withCreatedAt(Optional<? extends String> createdAt) {
+    public UpdateUserRequestBody withCreatedAt(Optional<String> createdAt) {
         Utils.checkNotNull(createdAt, "createdAt");
         this.createdAt = createdAt;
         return this;
@@ -1370,33 +1356,33 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateUserRequestBody other = (UpdateUserRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.externalId, other.externalId) &&
-            java.util.Objects.deepEquals(this.firstName, other.firstName) &&
-            java.util.Objects.deepEquals(this.lastName, other.lastName) &&
-            java.util.Objects.deepEquals(this.primaryEmailAddressId, other.primaryEmailAddressId) &&
-            java.util.Objects.deepEquals(this.notifyPrimaryEmailAddressChanged, other.notifyPrimaryEmailAddressChanged) &&
-            java.util.Objects.deepEquals(this.primaryPhoneNumberId, other.primaryPhoneNumberId) &&
-            java.util.Objects.deepEquals(this.primaryWeb3WalletId, other.primaryWeb3WalletId) &&
-            java.util.Objects.deepEquals(this.username, other.username) &&
-            java.util.Objects.deepEquals(this.profileImageId, other.profileImageId) &&
-            java.util.Objects.deepEquals(this.password, other.password) &&
-            java.util.Objects.deepEquals(this.passwordDigest, other.passwordDigest) &&
-            java.util.Objects.deepEquals(this.passwordHasher, other.passwordHasher) &&
-            java.util.Objects.deepEquals(this.skipPasswordChecks, other.skipPasswordChecks) &&
-            java.util.Objects.deepEquals(this.signOutOfOtherSessions, other.signOutOfOtherSessions) &&
-            java.util.Objects.deepEquals(this.totpSecret, other.totpSecret) &&
-            java.util.Objects.deepEquals(this.backupCodes, other.backupCodes) &&
-            java.util.Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
-            java.util.Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
-            java.util.Objects.deepEquals(this.unsafeMetadata, other.unsafeMetadata) &&
-            java.util.Objects.deepEquals(this.deleteSelfEnabled, other.deleteSelfEnabled) &&
-            java.util.Objects.deepEquals(this.createOrganizationEnabled, other.createOrganizationEnabled) &&
-            java.util.Objects.deepEquals(this.createdAt, other.createdAt);
+            Objects.deepEquals(this.externalId, other.externalId) &&
+            Objects.deepEquals(this.firstName, other.firstName) &&
+            Objects.deepEquals(this.lastName, other.lastName) &&
+            Objects.deepEquals(this.primaryEmailAddressId, other.primaryEmailAddressId) &&
+            Objects.deepEquals(this.notifyPrimaryEmailAddressChanged, other.notifyPrimaryEmailAddressChanged) &&
+            Objects.deepEquals(this.primaryPhoneNumberId, other.primaryPhoneNumberId) &&
+            Objects.deepEquals(this.primaryWeb3WalletId, other.primaryWeb3WalletId) &&
+            Objects.deepEquals(this.username, other.username) &&
+            Objects.deepEquals(this.profileImageId, other.profileImageId) &&
+            Objects.deepEquals(this.password, other.password) &&
+            Objects.deepEquals(this.passwordDigest, other.passwordDigest) &&
+            Objects.deepEquals(this.passwordHasher, other.passwordHasher) &&
+            Objects.deepEquals(this.skipPasswordChecks, other.skipPasswordChecks) &&
+            Objects.deepEquals(this.signOutOfOtherSessions, other.signOutOfOtherSessions) &&
+            Objects.deepEquals(this.totpSecret, other.totpSecret) &&
+            Objects.deepEquals(this.backupCodes, other.backupCodes) &&
+            Objects.deepEquals(this.publicMetadata, other.publicMetadata) &&
+            Objects.deepEquals(this.privateMetadata, other.privateMetadata) &&
+            Objects.deepEquals(this.unsafeMetadata, other.unsafeMetadata) &&
+            Objects.deepEquals(this.deleteSelfEnabled, other.deleteSelfEnabled) &&
+            Objects.deepEquals(this.createOrganizationEnabled, other.createOrganizationEnabled) &&
+            Objects.deepEquals(this.createdAt, other.createdAt);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             externalId,
             firstName,
             lastName,
@@ -1450,37 +1436,37 @@ public String toString() {
     
     public final static class Builder {
  
-        private JsonNullable<? extends String> externalId = JsonNullable.undefined();
+        private JsonNullable<String> externalId = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> firstName = JsonNullable.undefined();
+        private JsonNullable<String> firstName = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> lastName = JsonNullable.undefined();
+        private JsonNullable<String> lastName = JsonNullable.undefined();
  
-        private Optional<? extends String> primaryEmailAddressId = Optional.empty();
+        private Optional<String> primaryEmailAddressId = Optional.empty();
  
-        private Optional<? extends Boolean> notifyPrimaryEmailAddressChanged;
+        private Optional<Boolean> notifyPrimaryEmailAddressChanged;
  
-        private Optional<? extends String> primaryPhoneNumberId = Optional.empty();
+        private Optional<String> primaryPhoneNumberId = Optional.empty();
  
-        private Optional<? extends String> primaryWeb3WalletId = Optional.empty();
+        private Optional<String> primaryWeb3WalletId = Optional.empty();
  
-        private JsonNullable<? extends String> username = JsonNullable.undefined();
+        private JsonNullable<String> username = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> profileImageId = JsonNullable.undefined();
+        private JsonNullable<String> profileImageId = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> password = JsonNullable.undefined();
+        private JsonNullable<String> password = JsonNullable.undefined();
  
-        private Optional<? extends String> passwordDigest = Optional.empty();
+        private Optional<String> passwordDigest = Optional.empty();
  
         private Optional<? extends UpdateUserPasswordHasher> passwordHasher = Optional.empty();
  
-        private JsonNullable<? extends Boolean> skipPasswordChecks = JsonNullable.undefined();
+        private JsonNullable<Boolean> skipPasswordChecks = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> signOutOfOtherSessions = JsonNullable.undefined();
+        private JsonNullable<Boolean> signOutOfOtherSessions = JsonNullable.undefined();
  
-        private Optional<? extends String> totpSecret = Optional.empty();
+        private Optional<String> totpSecret = Optional.empty();
  
-        private Optional<? extends java.util.List<String>> backupCodes = Optional.empty();
+        private Optional<? extends List<String>> backupCodes = Optional.empty();
  
         private Optional<? extends UpdateUserPublicMetadata> publicMetadata = Optional.empty();
  
@@ -1488,11 +1474,11 @@ public final static class Builder {
  
         private Optional<? extends UpdateUserUnsafeMetadata> unsafeMetadata = Optional.empty();
  
-        private JsonNullable<? extends Boolean> deleteSelfEnabled = JsonNullable.undefined();
+        private JsonNullable<Boolean> deleteSelfEnabled = JsonNullable.undefined();
  
-        private JsonNullable<? extends Boolean> createOrganizationEnabled = JsonNullable.undefined();
+        private JsonNullable<Boolean> createOrganizationEnabled = JsonNullable.undefined();
  
-        private Optional<? extends String> createdAt = Optional.empty();  
+        private Optional<String> createdAt = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -1512,7 +1498,7 @@ public Builder externalId(String externalId) {
          * The ID of the user as used in your external systems or your previous authentication solution.
          * Must be unique across your instance.
          */
-        public Builder externalId(JsonNullable<? extends String> externalId) {
+        public Builder externalId(JsonNullable<String> externalId) {
             Utils.checkNotNull(externalId, "externalId");
             this.externalId = externalId;
             return this;
@@ -1530,7 +1516,7 @@ public Builder firstName(String firstName) {
         /**
          * The first name to assign to the user
          */
-        public Builder firstName(JsonNullable<? extends String> firstName) {
+        public Builder firstName(JsonNullable<String> firstName) {
             Utils.checkNotNull(firstName, "firstName");
             this.firstName = firstName;
             return this;
@@ -1548,7 +1534,7 @@ public Builder lastName(String lastName) {
         /**
          * The last name to assign to the user
          */
-        public Builder lastName(JsonNullable<? extends String> lastName) {
+        public Builder lastName(JsonNullable<String> lastName) {
             Utils.checkNotNull(lastName, "lastName");
             this.lastName = lastName;
             return this;
@@ -1568,7 +1554,7 @@ public Builder primaryEmailAddressId(String primaryEmailAddressId) {
          * The ID of the email address to set as primary.
          * It must be verified, and present on the current user.
          */
-        public Builder primaryEmailAddressId(Optional<? extends String> primaryEmailAddressId) {
+        public Builder primaryEmailAddressId(Optional<String> primaryEmailAddressId) {
             Utils.checkNotNull(primaryEmailAddressId, "primaryEmailAddressId");
             this.primaryEmailAddressId = primaryEmailAddressId;
             return this;
@@ -1588,7 +1574,7 @@ public Builder notifyPrimaryEmailAddressChanged(boolean notifyPrimaryEmailAddres
          * If set to `true`, the user will be notified that their primary email address has changed.
          * By default, no notification is sent.
          */
-        public Builder notifyPrimaryEmailAddressChanged(Optional<? extends Boolean> notifyPrimaryEmailAddressChanged) {
+        public Builder notifyPrimaryEmailAddressChanged(Optional<Boolean> notifyPrimaryEmailAddressChanged) {
             Utils.checkNotNull(notifyPrimaryEmailAddressChanged, "notifyPrimaryEmailAddressChanged");
             this.notifyPrimaryEmailAddressChanged = notifyPrimaryEmailAddressChanged;
             return this;
@@ -1608,7 +1594,7 @@ public Builder primaryPhoneNumberId(String primaryPhoneNumberId) {
          * The ID of the phone number to set as primary.
          * It must be verified, and present on the current user.
          */
-        public Builder primaryPhoneNumberId(Optional<? extends String> primaryPhoneNumberId) {
+        public Builder primaryPhoneNumberId(Optional<String> primaryPhoneNumberId) {
             Utils.checkNotNull(primaryPhoneNumberId, "primaryPhoneNumberId");
             this.primaryPhoneNumberId = primaryPhoneNumberId;
             return this;
@@ -1628,7 +1614,7 @@ public Builder primaryWeb3WalletId(String primaryWeb3WalletId) {
          * The ID of the web3 wallets to set as primary.
          * It must be verified, and present on the current user.
          */
-        public Builder primaryWeb3WalletId(Optional<? extends String> primaryWeb3WalletId) {
+        public Builder primaryWeb3WalletId(Optional<String> primaryWeb3WalletId) {
             Utils.checkNotNull(primaryWeb3WalletId, "primaryWeb3WalletId");
             this.primaryWeb3WalletId = primaryWeb3WalletId;
             return this;
@@ -1648,7 +1634,7 @@ public Builder username(String username) {
          * The username to give to the user.
          * It must be unique across your instance.
          */
-        public Builder username(JsonNullable<? extends String> username) {
+        public Builder username(JsonNullable<String> username) {
             Utils.checkNotNull(username, "username");
             this.username = username;
             return this;
@@ -1666,7 +1652,7 @@ public Builder profileImageId(String profileImageId) {
         /**
          * The ID of the image to set as the user's profile image
          */
-        public Builder profileImageId(JsonNullable<? extends String> profileImageId) {
+        public Builder profileImageId(JsonNullable<String> profileImageId) {
             Utils.checkNotNull(profileImageId, "profileImageId");
             this.profileImageId = profileImageId;
             return this;
@@ -1686,7 +1672,7 @@ public Builder password(String password) {
          * The plaintext password to give the user.
          * Must be at least 8 characters long, and can not be in any list of hacked passwords.
          */
-        public Builder password(JsonNullable<? extends String> password) {
+        public Builder password(JsonNullable<String> password) {
             Utils.checkNotNull(password, "password");
             this.password = password;
             return this;
@@ -1708,7 +1694,7 @@ public Builder passwordDigest(String passwordDigest) {
          * The digests should be generated with one of the supported algorithms.
          * The hashing algorithm can be specified using the `password_hasher` property.
          */
-        public Builder passwordDigest(Optional<? extends String> passwordDigest) {
+        public Builder passwordDigest(Optional<String> passwordDigest) {
             Utils.checkNotNull(passwordDigest, "passwordDigest");
             this.passwordDigest = passwordDigest;
             return this;
@@ -1970,7 +1956,7 @@ public Builder skipPasswordChecks(boolean skipPasswordChecks) {
         /**
          * Set it to `true` if you're updating the user's password and want to skip any password policy settings check. This parameter can only be used when providing a `password`.
          */
-        public Builder skipPasswordChecks(JsonNullable<? extends Boolean> skipPasswordChecks) {
+        public Builder skipPasswordChecks(JsonNullable<Boolean> skipPasswordChecks) {
             Utils.checkNotNull(skipPasswordChecks, "skipPasswordChecks");
             this.skipPasswordChecks = skipPasswordChecks;
             return this;
@@ -1988,7 +1974,7 @@ public Builder signOutOfOtherSessions(boolean signOutOfOtherSessions) {
         /**
          * Set to `true` to sign out the user from all their active sessions once their password is updated. This parameter can only be used when providing a `password`.
          */
-        public Builder signOutOfOtherSessions(JsonNullable<? extends Boolean> signOutOfOtherSessions) {
+        public Builder signOutOfOtherSessions(JsonNullable<Boolean> signOutOfOtherSessions) {
             Utils.checkNotNull(signOutOfOtherSessions, "signOutOfOtherSessions");
             this.signOutOfOtherSessions = signOutOfOtherSessions;
             return this;
@@ -2014,7 +2000,7 @@ public Builder totpSecret(String totpSecret) {
          * * Code length: 6 digits
          * * Algorithm: SHA1
          */
-        public Builder totpSecret(Optional<? extends String> totpSecret) {
+        public Builder totpSecret(Optional<String> totpSecret) {
             Utils.checkNotNull(totpSecret, "totpSecret");
             this.totpSecret = totpSecret;
             return this;
@@ -2024,7 +2010,7 @@ public Builder totpSecret(Optional<? extends String> totpSecret) {
          * If Backup Codes are configured on the instance, you can provide them to enable it on the specific user without the need to reset them.
          * You must provide the backup codes in plain format or the corresponding bcrypt digest.
          */
-        public Builder backupCodes(java.util.List<String> backupCodes) {
+        public Builder backupCodes(List<String> backupCodes) {
             Utils.checkNotNull(backupCodes, "backupCodes");
             this.backupCodes = Optional.ofNullable(backupCodes);
             return this;
@@ -2034,7 +2020,7 @@ public Builder backupCodes(java.util.List<String> backupCodes) {
          * If Backup Codes are configured on the instance, you can provide them to enable it on the specific user without the need to reset them.
          * You must provide the backup codes in plain format or the corresponding bcrypt digest.
          */
-        public Builder backupCodes(Optional<? extends java.util.List<String>> backupCodes) {
+        public Builder backupCodes(Optional<? extends List<String>> backupCodes) {
             Utils.checkNotNull(backupCodes, "backupCodes");
             this.backupCodes = backupCodes;
             return this;
@@ -2108,7 +2094,7 @@ public Builder deleteSelfEnabled(boolean deleteSelfEnabled) {
         /**
          * If true, the user can delete themselves with the Frontend API.
          */
-        public Builder deleteSelfEnabled(JsonNullable<? extends Boolean> deleteSelfEnabled) {
+        public Builder deleteSelfEnabled(JsonNullable<Boolean> deleteSelfEnabled) {
             Utils.checkNotNull(deleteSelfEnabled, "deleteSelfEnabled");
             this.deleteSelfEnabled = deleteSelfEnabled;
             return this;
@@ -2126,7 +2112,7 @@ public Builder createOrganizationEnabled(boolean createOrganizationEnabled) {
         /**
          * If true, the user can create organizations with the Frontend API.
          */
-        public Builder createOrganizationEnabled(JsonNullable<? extends Boolean> createOrganizationEnabled) {
+        public Builder createOrganizationEnabled(JsonNullable<Boolean> createOrganizationEnabled) {
             Utils.checkNotNull(createOrganizationEnabled, "createOrganizationEnabled");
             this.createOrganizationEnabled = createOrganizationEnabled;
             return this;
@@ -2144,7 +2130,7 @@ public Builder createdAt(String createdAt) {
         /**
          * A custom date/time denoting _when_ the user signed up to the application, specified in RFC3339 format (e.g. `2012-10-20T07:15:20.902Z`).
          */
-        public Builder createdAt(Optional<? extends String> createdAt) {
+        public Builder createdAt(Optional<String> createdAt) {
             Utils.checkNotNull(createdAt, "createdAt");
             this.createdAt = createdAt;
             return this;
@@ -2179,11 +2165,11 @@ public UpdateUserRequestBody build() {
                 createdAt);
         }
 
-        private static final LazySingletonValue<Optional<? extends Boolean>> _SINGLETON_VALUE_NotifyPrimaryEmailAddressChanged =
+        private static final LazySingletonValue<Optional<Boolean>> _SINGLETON_VALUE_NotifyPrimaryEmailAddressChanged =
                 new LazySingletonValue<>(
                         "notify_primary_email_address_changed",
                         "false",
-                        new TypeReference<Optional<? extends Boolean>>() {});
+                        new TypeReference<Optional<Boolean>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserRequestBuilder.java
index 20d38c5..fa232ec 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
+import java.lang.String;
 
 public class UpdateUserRequestBuilder {
 
@@ -27,13 +17,13 @@ public UpdateUserRequestBuilder(SDKMethodInterfaces.MethodCallUpdateUser sdk) {
         this.sdk = sdk;
     }
 
-    public UpdateUserRequestBuilder userId(String userId) {
+    public UpdateUserRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
     }
 
-    public UpdateUserRequestBuilder requestBody(UpdateUserRequestBody requestBody) {
+    public UpdateUserRequestBuilder requestBody(com.clerk.backend_api.models.operations.UpdateUserRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserResponse.java
index 0cef77d..6a6deb7 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.User;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpdateUserResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpdateUserResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpdateUserResponse implements com.clerk.backend_api.utils.Response
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.User> user;
+    private Optional<? extends User> user;
 
     @JsonCreator
     public UpdateUserResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.User> user) {
+            Optional<? extends User> user) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.User> user() {
-        return (Optional<com.clerk.backend_api.models.components.User>) user;
+    public Optional<User> user() {
+        return (Optional<User>) user;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpdateUserResponse withRawResponse(HttpResponse<InputStream> rawResponse)
     /**
      * Success
      */
-    public UpdateUserResponse withUser(com.clerk.backend_api.models.components.User user) {
+    public UpdateUserResponse withUser(User user) {
         Utils.checkNotNull(user, "user");
         this.user = Optional.ofNullable(user);
         return this;
@@ -137,7 +141,7 @@ public UpdateUserResponse withUser(com.clerk.backend_api.models.components.User
     /**
      * Success
      */
-    public UpdateUserResponse withUser(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+    public UpdateUserResponse withUser(Optional<? extends User> user) {
         Utils.checkNotNull(user, "user");
         this.user = user;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpdateUserResponse other = (UpdateUserResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.user, other.user);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.user, other.user);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.User> user = Optional.empty();  
+        private Optional<? extends User> user = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder user(com.clerk.backend_api.models.components.User user) {
+        public Builder user(User user) {
             Utils.checkNotNull(user, "user");
             this.user = Optional.ofNullable(user);
             return this;
@@ -230,7 +234,7 @@ public Builder user(com.clerk.backend_api.models.components.User user) {
         /**
          * Success
          */
-        public Builder user(Optional<? extends com.clerk.backend_api.models.components.User> user) {
+        public Builder user(Optional<? extends User> user) {
             Utils.checkNotNull(user, "user");
             this.user = user;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserUnsafeMetadata.java b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserUnsafeMetadata.java
index df29cca..ae07574 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpdateUserUnsafeMetadata.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpdateUserUnsafeMetadata.java
@@ -4,15 +4,13 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 /**
  * UpdateUserUnsafeMetadata - Metadata saved on the user, that can be updated from both the Frontend and Backend APIs.
  * Note: Since this data can be modified from the frontend, it is not guaranteed to be safe.
@@ -43,7 +41,7 @@ public boolean equals(java.lang.Object o) {
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             );
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoFile.java b/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoFile.java
index 651ed5a..356dde9 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoFile.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoFile.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class UploadOrganizationLogoFile {
 
@@ -69,13 +68,13 @@ public boolean equals(java.lang.Object o) {
         }
         UploadOrganizationLogoFile other = (UploadOrganizationLogoFile) o;
         return 
-            java.util.Objects.deepEquals(this.fileName, other.fileName) &&
-            java.util.Objects.deepEquals(this.content, other.content);
+            Objects.deepEquals(this.fileName, other.fileName) &&
+            Objects.deepEquals(this.content, other.content);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             fileName,
             content);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoRequest.java
index 1fed09b..832f500 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoRequest.java
@@ -4,18 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class UploadOrganizationLogoRequest {
 
     /**
@@ -91,13 +91,13 @@ public boolean equals(java.lang.Object o) {
         }
         UploadOrganizationLogoRequest other = (UploadOrganizationLogoRequest) o;
         return 
-            java.util.Objects.deepEquals(this.organizationId, other.organizationId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.organizationId, other.organizationId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             organizationId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoRequestBody.java
index 5b6d310..31e0c43 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoRequestBody.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class UploadOrganizationLogoRequestBody {
 
@@ -78,13 +77,13 @@ public boolean equals(java.lang.Object o) {
         }
         UploadOrganizationLogoRequestBody other = (UploadOrganizationLogoRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.uploaderUserId, other.uploaderUserId) &&
-            java.util.Objects.deepEquals(this.file, other.file);
+            Objects.deepEquals(this.uploaderUserId, other.uploaderUserId) &&
+            Objects.deepEquals(this.file, other.file);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             uploaderUserId,
             file);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoRequestBuilder.java
index 5693ec1..75a8c16 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoRequestBuilder.java
@@ -4,18 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.String;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class UploadOrganizationLogoRequestBuilder {
 
@@ -27,19 +18,19 @@ public UploadOrganizationLogoRequestBuilder(SDKMethodInterfaces.MethodCallUpload
         this.sdk = sdk;
     }
 
-    public UploadOrganizationLogoRequestBuilder organizationId(String organizationId) {
+    public UploadOrganizationLogoRequestBuilder organizationId(java.lang.String organizationId) {
         Utils.checkNotNull(organizationId, "organizationId");
         this.organizationId = organizationId;
         return this;
     }
                 
-    public UploadOrganizationLogoRequestBuilder requestBody(UploadOrganizationLogoRequestBody requestBody) {
+    public UploadOrganizationLogoRequestBuilder requestBody(com.clerk.backend_api.models.operations.UploadOrganizationLogoRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = Optional.of(requestBody);
         return this;
     }
 
-    public UploadOrganizationLogoRequestBuilder requestBody(Optional<? extends UploadOrganizationLogoRequestBody> requestBody) {
+    public UploadOrganizationLogoRequestBuilder requestBody(java.util.Optional<? extends com.clerk.backend_api.models.operations.UploadOrganizationLogoRequestBody> requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoResponse.java
index ea73223..7483425 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UploadOrganizationLogoResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OrganizationWithLogo;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UploadOrganizationLogoResponse implements com.clerk.backend_api.utils.Response {
+
+public class UploadOrganizationLogoResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UploadOrganizationLogoResponse implements com.clerk.backend_api.uti
     /**
      * An organization with a logo URL.
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OrganizationWithLogo> organizationWithLogo;
+    private Optional<? extends OrganizationWithLogo> organizationWithLogo;
 
     @JsonCreator
     public UploadOrganizationLogoResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OrganizationWithLogo> organizationWithLogo) {
+            Optional<? extends OrganizationWithLogo> organizationWithLogo) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OrganizationWithLogo> organizationWithLogo() {
-        return (Optional<com.clerk.backend_api.models.components.OrganizationWithLogo>) organizationWithLogo;
+    public Optional<OrganizationWithLogo> organizationWithLogo() {
+        return (Optional<OrganizationWithLogo>) organizationWithLogo;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UploadOrganizationLogoResponse withRawResponse(HttpResponse<InputStream>
     /**
      * An organization with a logo URL.
      */
-    public UploadOrganizationLogoResponse withOrganizationWithLogo(com.clerk.backend_api.models.components.OrganizationWithLogo organizationWithLogo) {
+    public UploadOrganizationLogoResponse withOrganizationWithLogo(OrganizationWithLogo organizationWithLogo) {
         Utils.checkNotNull(organizationWithLogo, "organizationWithLogo");
         this.organizationWithLogo = Optional.ofNullable(organizationWithLogo);
         return this;
@@ -137,7 +141,7 @@ public UploadOrganizationLogoResponse withOrganizationWithLogo(com.clerk.backend
     /**
      * An organization with a logo URL.
      */
-    public UploadOrganizationLogoResponse withOrganizationWithLogo(Optional<? extends com.clerk.backend_api.models.components.OrganizationWithLogo> organizationWithLogo) {
+    public UploadOrganizationLogoResponse withOrganizationWithLogo(Optional<? extends OrganizationWithLogo> organizationWithLogo) {
         Utils.checkNotNull(organizationWithLogo, "organizationWithLogo");
         this.organizationWithLogo = organizationWithLogo;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UploadOrganizationLogoResponse other = (UploadOrganizationLogoResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizationWithLogo, other.organizationWithLogo);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizationWithLogo, other.organizationWithLogo);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OrganizationWithLogo> organizationWithLogo = Optional.empty();  
+        private Optional<? extends OrganizationWithLogo> organizationWithLogo = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * An organization with a logo URL.
          */
-        public Builder organizationWithLogo(com.clerk.backend_api.models.components.OrganizationWithLogo organizationWithLogo) {
+        public Builder organizationWithLogo(OrganizationWithLogo organizationWithLogo) {
             Utils.checkNotNull(organizationWithLogo, "organizationWithLogo");
             this.organizationWithLogo = Optional.ofNullable(organizationWithLogo);
             return this;
@@ -230,7 +234,7 @@ public Builder organizationWithLogo(com.clerk.backend_api.models.components.Orga
         /**
          * An organization with a logo URL.
          */
-        public Builder organizationWithLogo(Optional<? extends com.clerk.backend_api.models.components.OrganizationWithLogo> organizationWithLogo) {
+        public Builder organizationWithLogo(Optional<? extends OrganizationWithLogo> organizationWithLogo) {
             Utils.checkNotNull(organizationWithLogo, "organizationWithLogo");
             this.organizationWithLogo = organizationWithLogo;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplatePathParamTemplateType.java b/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplatePathParamTemplateType.java
index 6bb145b..b55aec6 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplatePathParamTemplateType.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplatePathParamTemplateType.java
@@ -4,16 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.String;
 
 /**
  * UpsertTemplatePathParamTemplateType - The type of template to update
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateRequest.java
index 3438e8e..f28ddaa 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateRequest.java
@@ -4,18 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class UpsertTemplateRequest {
 
     /**
@@ -118,14 +118,14 @@ public boolean equals(java.lang.Object o) {
         }
         UpsertTemplateRequest other = (UpsertTemplateRequest) o;
         return 
-            java.util.Objects.deepEquals(this.templateType, other.templateType) &&
-            java.util.Objects.deepEquals(this.slug, other.slug) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.templateType, other.templateType) &&
+            Objects.deepEquals(this.slug, other.slug) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             templateType,
             slug,
             requestBody);
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateRequestBody.java
index 3ca89c2..3b1199d 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateRequestBody.java
@@ -4,21 +4,21 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 import org.openapitools.jackson.nullable.JsonNullable;
 
+
 public class UpsertTemplateRequestBody {
 
     /**
@@ -26,7 +26,7 @@ public class UpsertTemplateRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("name")
-    private Optional<? extends String> name;
+    private Optional<String> name;
 
     /**
      * The email subject.
@@ -34,28 +34,28 @@ public class UpsertTemplateRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("subject")
-    private JsonNullable<? extends String> subject;
+    private JsonNullable<String> subject;
 
     /**
      * The editor markup used to generate the body of the template
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("markup")
-    private JsonNullable<? extends String> markup;
+    private JsonNullable<String> markup;
 
     /**
      * The template body before variable interpolation
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("body")
-    private Optional<? extends String> body;
+    private Optional<String> body;
 
     /**
      * Whether Clerk should deliver emails or SMS messages based on the current template
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("delivered_by_clerk")
-    private JsonNullable<? extends Boolean> deliveredByClerk;
+    private JsonNullable<Boolean> deliveredByClerk;
 
     /**
      * The local part of the From email address that will be used for emails.
@@ -64,7 +64,7 @@ public class UpsertTemplateRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("from_email_name")
-    private Optional<? extends String> fromEmailName;
+    private Optional<String> fromEmailName;
 
     /**
      * The local part of the Reply To email address that will be used for emails.
@@ -73,17 +73,17 @@ public class UpsertTemplateRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("reply_to_email_name")
-    private Optional<? extends String> replyToEmailName;
+    private Optional<String> replyToEmailName;
 
     @JsonCreator
     public UpsertTemplateRequestBody(
-            @JsonProperty("name") Optional<? extends String> name,
-            @JsonProperty("subject") JsonNullable<? extends String> subject,
-            @JsonProperty("markup") JsonNullable<? extends String> markup,
-            @JsonProperty("body") Optional<? extends String> body,
-            @JsonProperty("delivered_by_clerk") JsonNullable<? extends Boolean> deliveredByClerk,
-            @JsonProperty("from_email_name") Optional<? extends String> fromEmailName,
-            @JsonProperty("reply_to_email_name") Optional<? extends String> replyToEmailName) {
+            @JsonProperty("name") Optional<String> name,
+            @JsonProperty("subject") JsonNullable<String> subject,
+            @JsonProperty("markup") JsonNullable<String> markup,
+            @JsonProperty("body") Optional<String> body,
+            @JsonProperty("delivered_by_clerk") JsonNullable<Boolean> deliveredByClerk,
+            @JsonProperty("from_email_name") Optional<String> fromEmailName,
+            @JsonProperty("reply_to_email_name") Optional<String> replyToEmailName) {
         Utils.checkNotNull(name, "name");
         Utils.checkNotNull(subject, "subject");
         Utils.checkNotNull(markup, "markup");
@@ -107,47 +107,42 @@ public UpsertTemplateRequestBody() {
     /**
      * The user-friendly name of the template
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> name() {
-        return (Optional<String>) name;
+        return name;
     }
 
     /**
      * The email subject.
      * Applicable only to email templates.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> subject() {
-        return (JsonNullable<String>) subject;
+        return subject;
     }
 
     /**
      * The editor markup used to generate the body of the template
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<String> markup() {
-        return (JsonNullable<String>) markup;
+        return markup;
     }
 
     /**
      * The template body before variable interpolation
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> body() {
-        return (Optional<String>) body;
+        return body;
     }
 
     /**
      * Whether Clerk should deliver emails or SMS messages based on the current template
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public JsonNullable<Boolean> deliveredByClerk() {
-        return (JsonNullable<Boolean>) deliveredByClerk;
+        return deliveredByClerk;
     }
 
     /**
@@ -155,10 +150,9 @@ public JsonNullable<Boolean> deliveredByClerk() {
      * For example, in the address 'hello@example.com', the local part is 'hello'.
      * Applicable only to email templates.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> fromEmailName() {
-        return (Optional<String>) fromEmailName;
+        return fromEmailName;
     }
 
     /**
@@ -166,10 +160,9 @@ public Optional<String> fromEmailName() {
      * For example, in the address 'hello@example.com', the local part is 'hello'.
      * Applicable only to email templates.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> replyToEmailName() {
-        return (Optional<String>) replyToEmailName;
+        return replyToEmailName;
     }
 
     public final static Builder builder() {
@@ -188,7 +181,7 @@ public UpsertTemplateRequestBody withName(String name) {
     /**
      * The user-friendly name of the template
      */
-    public UpsertTemplateRequestBody withName(Optional<? extends String> name) {
+    public UpsertTemplateRequestBody withName(Optional<String> name) {
         Utils.checkNotNull(name, "name");
         this.name = name;
         return this;
@@ -208,7 +201,7 @@ public UpsertTemplateRequestBody withSubject(String subject) {
      * The email subject.
      * Applicable only to email templates.
      */
-    public UpsertTemplateRequestBody withSubject(JsonNullable<? extends String> subject) {
+    public UpsertTemplateRequestBody withSubject(JsonNullable<String> subject) {
         Utils.checkNotNull(subject, "subject");
         this.subject = subject;
         return this;
@@ -226,7 +219,7 @@ public UpsertTemplateRequestBody withMarkup(String markup) {
     /**
      * The editor markup used to generate the body of the template
      */
-    public UpsertTemplateRequestBody withMarkup(JsonNullable<? extends String> markup) {
+    public UpsertTemplateRequestBody withMarkup(JsonNullable<String> markup) {
         Utils.checkNotNull(markup, "markup");
         this.markup = markup;
         return this;
@@ -244,7 +237,7 @@ public UpsertTemplateRequestBody withBody(String body) {
     /**
      * The template body before variable interpolation
      */
-    public UpsertTemplateRequestBody withBody(Optional<? extends String> body) {
+    public UpsertTemplateRequestBody withBody(Optional<String> body) {
         Utils.checkNotNull(body, "body");
         this.body = body;
         return this;
@@ -262,7 +255,7 @@ public UpsertTemplateRequestBody withDeliveredByClerk(boolean deliveredByClerk)
     /**
      * Whether Clerk should deliver emails or SMS messages based on the current template
      */
-    public UpsertTemplateRequestBody withDeliveredByClerk(JsonNullable<? extends Boolean> deliveredByClerk) {
+    public UpsertTemplateRequestBody withDeliveredByClerk(JsonNullable<Boolean> deliveredByClerk) {
         Utils.checkNotNull(deliveredByClerk, "deliveredByClerk");
         this.deliveredByClerk = deliveredByClerk;
         return this;
@@ -284,7 +277,7 @@ public UpsertTemplateRequestBody withFromEmailName(String fromEmailName) {
      * For example, in the address 'hello@example.com', the local part is 'hello'.
      * Applicable only to email templates.
      */
-    public UpsertTemplateRequestBody withFromEmailName(Optional<? extends String> fromEmailName) {
+    public UpsertTemplateRequestBody withFromEmailName(Optional<String> fromEmailName) {
         Utils.checkNotNull(fromEmailName, "fromEmailName");
         this.fromEmailName = fromEmailName;
         return this;
@@ -306,7 +299,7 @@ public UpsertTemplateRequestBody withReplyToEmailName(String replyToEmailName) {
      * For example, in the address 'hello@example.com', the local part is 'hello'.
      * Applicable only to email templates.
      */
-    public UpsertTemplateRequestBody withReplyToEmailName(Optional<? extends String> replyToEmailName) {
+    public UpsertTemplateRequestBody withReplyToEmailName(Optional<String> replyToEmailName) {
         Utils.checkNotNull(replyToEmailName, "replyToEmailName");
         this.replyToEmailName = replyToEmailName;
         return this;
@@ -322,18 +315,18 @@ public boolean equals(java.lang.Object o) {
         }
         UpsertTemplateRequestBody other = (UpsertTemplateRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.name, other.name) &&
-            java.util.Objects.deepEquals(this.subject, other.subject) &&
-            java.util.Objects.deepEquals(this.markup, other.markup) &&
-            java.util.Objects.deepEquals(this.body, other.body) &&
-            java.util.Objects.deepEquals(this.deliveredByClerk, other.deliveredByClerk) &&
-            java.util.Objects.deepEquals(this.fromEmailName, other.fromEmailName) &&
-            java.util.Objects.deepEquals(this.replyToEmailName, other.replyToEmailName);
+            Objects.deepEquals(this.name, other.name) &&
+            Objects.deepEquals(this.subject, other.subject) &&
+            Objects.deepEquals(this.markup, other.markup) &&
+            Objects.deepEquals(this.body, other.body) &&
+            Objects.deepEquals(this.deliveredByClerk, other.deliveredByClerk) &&
+            Objects.deepEquals(this.fromEmailName, other.fromEmailName) &&
+            Objects.deepEquals(this.replyToEmailName, other.replyToEmailName);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             name,
             subject,
             markup,
@@ -357,19 +350,19 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> name = Optional.empty();
+        private Optional<String> name = Optional.empty();
  
-        private JsonNullable<? extends String> subject = JsonNullable.undefined();
+        private JsonNullable<String> subject = JsonNullable.undefined();
  
-        private JsonNullable<? extends String> markup = JsonNullable.undefined();
+        private JsonNullable<String> markup = JsonNullable.undefined();
  
-        private Optional<? extends String> body = Optional.empty();
+        private Optional<String> body = Optional.empty();
  
-        private JsonNullable<? extends Boolean> deliveredByClerk = JsonNullable.undefined();
+        private JsonNullable<Boolean> deliveredByClerk = JsonNullable.undefined();
  
-        private Optional<? extends String> fromEmailName = Optional.empty();
+        private Optional<String> fromEmailName = Optional.empty();
  
-        private Optional<? extends String> replyToEmailName = Optional.empty();  
+        private Optional<String> replyToEmailName = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -387,7 +380,7 @@ public Builder name(String name) {
         /**
          * The user-friendly name of the template
          */
-        public Builder name(Optional<? extends String> name) {
+        public Builder name(Optional<String> name) {
             Utils.checkNotNull(name, "name");
             this.name = name;
             return this;
@@ -407,7 +400,7 @@ public Builder subject(String subject) {
          * The email subject.
          * Applicable only to email templates.
          */
-        public Builder subject(JsonNullable<? extends String> subject) {
+        public Builder subject(JsonNullable<String> subject) {
             Utils.checkNotNull(subject, "subject");
             this.subject = subject;
             return this;
@@ -425,7 +418,7 @@ public Builder markup(String markup) {
         /**
          * The editor markup used to generate the body of the template
          */
-        public Builder markup(JsonNullable<? extends String> markup) {
+        public Builder markup(JsonNullable<String> markup) {
             Utils.checkNotNull(markup, "markup");
             this.markup = markup;
             return this;
@@ -443,7 +436,7 @@ public Builder body(String body) {
         /**
          * The template body before variable interpolation
          */
-        public Builder body(Optional<? extends String> body) {
+        public Builder body(Optional<String> body) {
             Utils.checkNotNull(body, "body");
             this.body = body;
             return this;
@@ -461,7 +454,7 @@ public Builder deliveredByClerk(boolean deliveredByClerk) {
         /**
          * Whether Clerk should deliver emails or SMS messages based on the current template
          */
-        public Builder deliveredByClerk(JsonNullable<? extends Boolean> deliveredByClerk) {
+        public Builder deliveredByClerk(JsonNullable<Boolean> deliveredByClerk) {
             Utils.checkNotNull(deliveredByClerk, "deliveredByClerk");
             this.deliveredByClerk = deliveredByClerk;
             return this;
@@ -483,7 +476,7 @@ public Builder fromEmailName(String fromEmailName) {
          * For example, in the address 'hello@example.com', the local part is 'hello'.
          * Applicable only to email templates.
          */
-        public Builder fromEmailName(Optional<? extends String> fromEmailName) {
+        public Builder fromEmailName(Optional<String> fromEmailName) {
             Utils.checkNotNull(fromEmailName, "fromEmailName");
             this.fromEmailName = fromEmailName;
             return this;
@@ -505,7 +498,7 @@ public Builder replyToEmailName(String replyToEmailName) {
          * For example, in the address 'hello@example.com', the local part is 'hello'.
          * Applicable only to email templates.
          */
-        public Builder replyToEmailName(Optional<? extends String> replyToEmailName) {
+        public Builder replyToEmailName(Optional<String> replyToEmailName) {
             Utils.checkNotNull(replyToEmailName, "replyToEmailName");
             this.replyToEmailName = replyToEmailName;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateRequestBuilder.java
index 639b67f..9dfda45 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateRequestBuilder.java
@@ -4,18 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.String;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class UpsertTemplateRequestBuilder {
 
@@ -28,25 +19,25 @@ public UpsertTemplateRequestBuilder(SDKMethodInterfaces.MethodCallUpsertTemplate
         this.sdk = sdk;
     }
 
-    public UpsertTemplateRequestBuilder templateType(UpsertTemplatePathParamTemplateType templateType) {
+    public UpsertTemplateRequestBuilder templateType(com.clerk.backend_api.models.operations.UpsertTemplatePathParamTemplateType templateType) {
         Utils.checkNotNull(templateType, "templateType");
         this.templateType = templateType;
         return this;
     }
 
-    public UpsertTemplateRequestBuilder slug(String slug) {
+    public UpsertTemplateRequestBuilder slug(java.lang.String slug) {
         Utils.checkNotNull(slug, "slug");
         this.slug = slug;
         return this;
     }
                 
-    public UpsertTemplateRequestBuilder requestBody(UpsertTemplateRequestBody requestBody) {
+    public UpsertTemplateRequestBuilder requestBody(com.clerk.backend_api.models.operations.UpsertTemplateRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = Optional.of(requestBody);
         return this;
     }
 
-    public UpsertTemplateRequestBuilder requestBody(Optional<? extends UpsertTemplateRequestBody> requestBody) {
+    public UpsertTemplateRequestBuilder requestBody(java.util.Optional<? extends com.clerk.backend_api.models.operations.UpsertTemplateRequestBody> requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateResponse.java
index 576d171..ef5602e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UpsertTemplateResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Template;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class UpsertTemplateResponse implements com.clerk.backend_api.utils.Response {
+
+public class UpsertTemplateResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class UpsertTemplateResponse implements com.clerk.backend_api.utils.Respo
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Template> template;
+    private Optional<? extends Template> template;
 
     @JsonCreator
     public UpsertTemplateResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Template> template) {
+            Optional<? extends Template> template) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Template> template() {
-        return (Optional<com.clerk.backend_api.models.components.Template>) template;
+    public Optional<Template> template() {
+        return (Optional<Template>) template;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public UpsertTemplateResponse withRawResponse(HttpResponse<InputStream> rawRespo
     /**
      * Success
      */
-    public UpsertTemplateResponse withTemplate(com.clerk.backend_api.models.components.Template template) {
+    public UpsertTemplateResponse withTemplate(Template template) {
         Utils.checkNotNull(template, "template");
         this.template = Optional.ofNullable(template);
         return this;
@@ -137,7 +141,7 @@ public UpsertTemplateResponse withTemplate(com.clerk.backend_api.models.componen
     /**
      * Success
      */
-    public UpsertTemplateResponse withTemplate(Optional<? extends com.clerk.backend_api.models.components.Template> template) {
+    public UpsertTemplateResponse withTemplate(Optional<? extends Template> template) {
         Utils.checkNotNull(template, "template");
         this.template = template;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         UpsertTemplateResponse other = (UpsertTemplateResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.template, other.template);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.template, other.template);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Template> template = Optional.empty();  
+        private Optional<? extends Template> template = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder template(com.clerk.backend_api.models.components.Template template) {
+        public Builder template(Template template) {
             Utils.checkNotNull(template, "template");
             this.template = Optional.ofNullable(template);
             return this;
@@ -230,7 +234,7 @@ public Builder template(com.clerk.backend_api.models.components.Template templat
         /**
          * Success
          */
-        public Builder template(Optional<? extends com.clerk.backend_api.models.components.Template> template) {
+        public Builder template(Optional<? extends Template> template) {
             Utils.checkNotNull(template, "template");
             this.template = template;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UsersGetOrganizationMembershipsRequest.java b/src/main/java/com/clerk/backend_api/models/operations/UsersGetOrganizationMembershipsRequest.java
index 2c9d5f8..ef92beb 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UsersGetOrganizationMembershipsRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UsersGetOrganizationMembershipsRequest.java
@@ -4,19 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class UsersGetOrganizationMembershipsRequest {
 
     /**
@@ -30,7 +31,7 @@ public class UsersGetOrganizationMembershipsRequest {
      * Can be used for paginating the results together with `offset`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=limit")
-    private Optional<? extends Long> limit;
+    private Optional<Long> limit;
 
     /**
      * Skip the first `offset` results when paginating.
@@ -38,13 +39,13 @@ public class UsersGetOrganizationMembershipsRequest {
      * To be used in conjunction with `limit`.
      */
     @SpeakeasyMetadata("queryParam:style=form,explode=true,name=offset")
-    private Optional<? extends Long> offset;
+    private Optional<Long> offset;
 
     @JsonCreator
     public UsersGetOrganizationMembershipsRequest(
             String userId,
-            Optional<? extends Long> limit,
-            Optional<? extends Long> offset) {
+            Optional<Long> limit,
+            Optional<Long> offset) {
         Utils.checkNotNull(userId, "userId");
         Utils.checkNotNull(limit, "limit");
         Utils.checkNotNull(offset, "offset");
@@ -70,10 +71,9 @@ public String userId() {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> limit() {
-        return (Optional<Long>) limit;
+        return limit;
     }
 
     /**
@@ -81,10 +81,9 @@ public Optional<Long> limit() {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Long> offset() {
-        return (Optional<Long>) offset;
+        return offset;
     }
 
     public final static Builder builder() {
@@ -114,7 +113,7 @@ public UsersGetOrganizationMembershipsRequest withLimit(long limit) {
      * Applies a limit to the number of results returned.
      * Can be used for paginating the results together with `offset`.
      */
-    public UsersGetOrganizationMembershipsRequest withLimit(Optional<? extends Long> limit) {
+    public UsersGetOrganizationMembershipsRequest withLimit(Optional<Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -136,7 +135,7 @@ public UsersGetOrganizationMembershipsRequest withOffset(long offset) {
      * Needs to be an integer greater or equal to zero.
      * To be used in conjunction with `limit`.
      */
-    public UsersGetOrganizationMembershipsRequest withOffset(Optional<? extends Long> offset) {
+    public UsersGetOrganizationMembershipsRequest withOffset(Optional<Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -152,14 +151,14 @@ public boolean equals(java.lang.Object o) {
         }
         UsersGetOrganizationMembershipsRequest other = (UsersGetOrganizationMembershipsRequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.limit, other.limit) &&
-            java.util.Objects.deepEquals(this.offset, other.offset);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.limit, other.limit) &&
+            Objects.deepEquals(this.offset, other.offset);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             limit,
             offset);
@@ -177,9 +176,9 @@ public final static class Builder {
  
         private String userId;
  
-        private Optional<? extends Long> limit;
+        private Optional<Long> limit;
  
-        private Optional<? extends Long> offset;  
+        private Optional<Long> offset;  
         
         private Builder() {
           // force use of static builder() method
@@ -208,7 +207,7 @@ public Builder limit(long limit) {
          * Applies a limit to the number of results returned.
          * Can be used for paginating the results together with `offset`.
          */
-        public Builder limit(Optional<? extends Long> limit) {
+        public Builder limit(Optional<Long> limit) {
             Utils.checkNotNull(limit, "limit");
             this.limit = limit;
             return this;
@@ -230,7 +229,7 @@ public Builder offset(long offset) {
          * Needs to be an integer greater or equal to zero.
          * To be used in conjunction with `limit`.
          */
-        public Builder offset(Optional<? extends Long> offset) {
+        public Builder offset(Optional<Long> offset) {
             Utils.checkNotNull(offset, "offset");
             this.offset = offset;
             return this;
@@ -249,17 +248,17 @@ public UsersGetOrganizationMembershipsRequest build() {
                 offset);
         }
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
                 new LazySingletonValue<>(
                         "limit",
                         "10",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
 
-        private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+        private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
                 new LazySingletonValue<>(
                         "offset",
                         "0",
-                        new TypeReference<Optional<? extends Long>>() {});
+                        new TypeReference<Optional<Long>>() {});
     }
 }
 
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UsersGetOrganizationMembershipsRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/UsersGetOrganizationMembershipsRequestBuilder.java
index c58c94b..7605e17 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UsersGetOrganizationMembershipsRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UsersGetOrganizationMembershipsRequestBuilder.java
@@ -8,33 +8,29 @@
 import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.Long;
+import java.lang.String;
 import java.util.Optional;
 import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class UsersGetOrganizationMembershipsRequestBuilder {
 
     private String userId;
-    private Optional<? extends Long> limit = Utils.readDefaultOrConstValue(
+    private Optional<Long> limit = Utils.readDefaultOrConstValue(
                             "limit",
                             "10",
-                            new TypeReference<Optional<? extends Long>>() {});
-    private Optional<? extends Long> offset = Utils.readDefaultOrConstValue(
+                            new TypeReference<Optional<Long>>() {});
+    private Optional<Long> offset = Utils.readDefaultOrConstValue(
                             "offset",
                             "0",
-                            new TypeReference<Optional<? extends Long>>() {});
+                            new TypeReference<Optional<Long>>() {});
     private final SDKMethodInterfaces.MethodCallUsersGetOrganizationMemberships sdk;
 
     public UsersGetOrganizationMembershipsRequestBuilder(SDKMethodInterfaces.MethodCallUsersGetOrganizationMemberships sdk) {
         this.sdk = sdk;
     }
 
-    public UsersGetOrganizationMembershipsRequestBuilder userId(String userId) {
+    public UsersGetOrganizationMembershipsRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
@@ -46,7 +42,7 @@ public UsersGetOrganizationMembershipsRequestBuilder limit(long limit) {
         return this;
     }
 
-    public UsersGetOrganizationMembershipsRequestBuilder limit(Optional<? extends Long> limit) {
+    public UsersGetOrganizationMembershipsRequestBuilder limit(java.util.Optional<java.lang.Long> limit) {
         Utils.checkNotNull(limit, "limit");
         this.limit = limit;
         return this;
@@ -58,7 +54,7 @@ public UsersGetOrganizationMembershipsRequestBuilder offset(long offset) {
         return this;
     }
 
-    public UsersGetOrganizationMembershipsRequestBuilder offset(Optional<? extends Long> offset) {
+    public UsersGetOrganizationMembershipsRequestBuilder offset(java.util.Optional<java.lang.Long> offset) {
         Utils.checkNotNull(offset, "offset");
         this.offset = offset;
         return this;
@@ -99,15 +95,15 @@ public Stream<UsersGetOrganizationMembershipsResponse> callAsStream() {
         });
     }
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Limit =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Limit =
             new LazySingletonValue<>(
                     "limit",
                     "10",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 
-    private static final LazySingletonValue<Optional<? extends Long>> _SINGLETON_VALUE_Offset =
+    private static final LazySingletonValue<Optional<Long>> _SINGLETON_VALUE_Offset =
             new LazySingletonValue<>(
                     "offset",
                     "0",
-                    new TypeReference<Optional<? extends Long>>() {});
+                    new TypeReference<Optional<Long>>() {});
 }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/UsersGetOrganizationMembershipsResponse.java b/src/main/java/com/clerk/backend_api/models/operations/UsersGetOrganizationMembershipsResponse.java
index 5ee19d7..55280da 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/UsersGetOrganizationMembershipsResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/UsersGetOrganizationMembershipsResponse.java
@@ -4,20 +4,26 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.OrganizationMemberships;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
 import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Exception;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 
-public class UsersGetOrganizationMembershipsResponse implements com.clerk.backend_api.utils.Response {
+
+public class UsersGetOrganizationMembershipsResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -37,7 +43,7 @@ public class UsersGetOrganizationMembershipsResponse implements com.clerk.backen
     /**
      * A list of organization memberships
      */
-    private Optional<? extends com.clerk.backend_api.models.components.OrganizationMemberships> organizationMemberships;
+    private Optional<? extends OrganizationMemberships> organizationMemberships;
 
     private Callable<Optional<UsersGetOrganizationMembershipsResponse>> next = () -> Optional.empty();
 
@@ -46,7 +52,7 @@ public UsersGetOrganizationMembershipsResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.OrganizationMemberships> organizationMemberships) {
+            Optional<? extends OrganizationMemberships> organizationMemberships) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -93,8 +99,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.OrganizationMemberships> organizationMemberships() {
-        return (Optional<com.clerk.backend_api.models.components.OrganizationMemberships>) organizationMemberships;
+    public Optional<OrganizationMemberships> organizationMemberships() {
+        return (Optional<OrganizationMemberships>) organizationMemberships;
     }
 
     public Optional<UsersGetOrganizationMembershipsResponse> next() throws Exception {
@@ -141,7 +147,7 @@ public UsersGetOrganizationMembershipsResponse withRawResponse(HttpResponse<Inpu
     /**
      * A list of organization memberships
      */
-    public UsersGetOrganizationMembershipsResponse withOrganizationMemberships(com.clerk.backend_api.models.components.OrganizationMemberships organizationMemberships) {
+    public UsersGetOrganizationMembershipsResponse withOrganizationMemberships(OrganizationMemberships organizationMemberships) {
         Utils.checkNotNull(organizationMemberships, "organizationMemberships");
         this.organizationMemberships = Optional.ofNullable(organizationMemberships);
         return this;
@@ -150,7 +156,7 @@ public UsersGetOrganizationMembershipsResponse withOrganizationMemberships(com.c
     /**
      * A list of organization memberships
      */
-    public UsersGetOrganizationMembershipsResponse withOrganizationMemberships(Optional<? extends com.clerk.backend_api.models.components.OrganizationMemberships> organizationMemberships) {
+    public UsersGetOrganizationMembershipsResponse withOrganizationMemberships(Optional<? extends OrganizationMemberships> organizationMemberships) {
         Utils.checkNotNull(organizationMemberships, "organizationMemberships");
         this.organizationMemberships = organizationMemberships;
         return this;
@@ -166,15 +172,15 @@ public boolean equals(java.lang.Object o) {
         }
         UsersGetOrganizationMembershipsResponse other = (UsersGetOrganizationMembershipsResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.organizationMemberships, other.organizationMemberships);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.organizationMemberships, other.organizationMemberships);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -199,7 +205,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.OrganizationMemberships> organizationMemberships = Optional.empty();  
+        private Optional<? extends OrganizationMemberships> organizationMemberships = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -235,7 +241,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * A list of organization memberships
          */
-        public Builder organizationMemberships(com.clerk.backend_api.models.components.OrganizationMemberships organizationMemberships) {
+        public Builder organizationMemberships(OrganizationMemberships organizationMemberships) {
             Utils.checkNotNull(organizationMemberships, "organizationMemberships");
             this.organizationMemberships = Optional.ofNullable(organizationMemberships);
             return this;
@@ -244,7 +250,7 @@ public Builder organizationMemberships(com.clerk.backend_api.models.components.O
         /**
          * A list of organization memberships
          */
-        public Builder organizationMemberships(Optional<? extends com.clerk.backend_api.models.components.OrganizationMemberships> organizationMemberships) {
+        public Builder organizationMemberships(Optional<? extends OrganizationMemberships> organizationMemberships) {
             Utils.checkNotNull(organizationMemberships, "organizationMemberships");
             this.organizationMemberships = organizationMemberships;
             return this;
@@ -253,7 +259,7 @@ public Builder organizationMemberships(Optional<? extends com.clerk.backend_api.
         /**
          * Internal API. Not for public use. Sets the provider of the next page.
          *
-         * @deprecated not part of the public API, may be removed without notice
+         * @Deprecated not part of the public API, may be removed without notice
          */
         @Deprecated
         public Builder next(Callable<Optional<UsersGetOrganizationMembershipsResponse>> next) {
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyClientRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyClientRequestBody.java
index ec89955..a81fdae 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyClientRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyClientRequestBody.java
@@ -4,19 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
+
 /**
  * VerifyClientRequestBody - Parameters.
  */
@@ -28,11 +27,11 @@ public class VerifyClientRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("token")
-    private Optional<? extends String> token;
+    private Optional<String> token;
 
     @JsonCreator
     public VerifyClientRequestBody(
-            @JsonProperty("token") Optional<? extends String> token) {
+            @JsonProperty("token") Optional<String> token) {
         Utils.checkNotNull(token, "token");
         this.token = token;
     }
@@ -44,10 +43,9 @@ public VerifyClientRequestBody() {
     /**
      * A JWT Token that represents the active client.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> token() {
-        return (Optional<String>) token;
+        return token;
     }
 
     public final static Builder builder() {
@@ -66,7 +64,7 @@ public VerifyClientRequestBody withToken(String token) {
     /**
      * A JWT Token that represents the active client.
      */
-    public VerifyClientRequestBody withToken(Optional<? extends String> token) {
+    public VerifyClientRequestBody withToken(Optional<String> token) {
         Utils.checkNotNull(token, "token");
         this.token = token;
         return this;
@@ -82,12 +80,12 @@ public boolean equals(java.lang.Object o) {
         }
         VerifyClientRequestBody other = (VerifyClientRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.token, other.token);
+            Objects.deepEquals(this.token, other.token);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             token);
     }
     
@@ -99,7 +97,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> token = Optional.empty();  
+        private Optional<String> token = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -117,7 +115,7 @@ public Builder token(String token) {
         /**
          * A JWT Token that represents the active client.
          */
-        public Builder token(Optional<? extends String> token) {
+        public Builder token(Optional<String> token) {
             Utils.checkNotNull(token, "token");
             this.token = token;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyClientRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyClientRequestBuilder.java
index 37fef17..daa8b5a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyClientRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyClientRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class VerifyClientRequestBuilder {
 
@@ -26,13 +16,13 @@ public VerifyClientRequestBuilder(SDKMethodInterfaces.MethodCallVerifyClient sdk
         this.sdk = sdk;
     }
                 
-    public VerifyClientRequestBuilder request(VerifyClientRequestBody request) {
+    public VerifyClientRequestBuilder request(com.clerk.backend_api.models.operations.VerifyClientRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public VerifyClientRequestBuilder request(Optional<? extends VerifyClientRequestBody> request) {
+    public VerifyClientRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.VerifyClientRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyClientResponse.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyClientResponse.java
index 5b67bd8..560846a 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyClientResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyClientResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Client;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class VerifyClientResponse implements com.clerk.backend_api.utils.Response {
+
+public class VerifyClientResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class VerifyClientResponse implements com.clerk.backend_api.utils.Respons
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Client> client;
+    private Optional<? extends Client> client;
 
     @JsonCreator
     public VerifyClientResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Client> client) {
+            Optional<? extends Client> client) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Client> client() {
-        return (Optional<com.clerk.backend_api.models.components.Client>) client;
+    public Optional<Client> client() {
+        return (Optional<Client>) client;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public VerifyClientResponse withRawResponse(HttpResponse<InputStream> rawRespons
     /**
      * Success
      */
-    public VerifyClientResponse withClient(com.clerk.backend_api.models.components.Client client) {
+    public VerifyClientResponse withClient(Client client) {
         Utils.checkNotNull(client, "client");
         this.client = Optional.ofNullable(client);
         return this;
@@ -137,7 +141,7 @@ public VerifyClientResponse withClient(com.clerk.backend_api.models.components.C
     /**
      * Success
      */
-    public VerifyClientResponse withClient(Optional<? extends com.clerk.backend_api.models.components.Client> client) {
+    public VerifyClientResponse withClient(Optional<? extends Client> client) {
         Utils.checkNotNull(client, "client");
         this.client = client;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         VerifyClientResponse other = (VerifyClientResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.client, other.client);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.client, other.client);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Client> client = Optional.empty();  
+        private Optional<? extends Client> client = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder client(com.clerk.backend_api.models.components.Client client) {
+        public Builder client(Client client) {
             Utils.checkNotNull(client, "client");
             this.client = Optional.ofNullable(client);
             return this;
@@ -230,7 +234,7 @@ public Builder client(com.clerk.backend_api.models.components.Client client) {
         /**
          * Success
          */
-        public Builder client(Optional<? extends com.clerk.backend_api.models.components.Client> client) {
+        public Builder client(Optional<? extends Client> client) {
             Utils.checkNotNull(client, "client");
             this.client = client;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyDomainProxyRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyDomainProxyRequestBody.java
index d1e4141..79efe70 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyDomainProxyRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyDomainProxyRequestBody.java
@@ -4,20 +4,19 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class VerifyDomainProxyRequestBody {
 
     /**
@@ -25,19 +24,19 @@ public class VerifyDomainProxyRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("domain_id")
-    private Optional<? extends String> domainId;
+    private Optional<String> domainId;
 
     /**
      * The full URL of the proxy which will forward requests to the Clerk Frontend API for this domain. e.g. https://example.com/__clerk
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("proxy_url")
-    private Optional<? extends String> proxyUrl;
+    private Optional<String> proxyUrl;
 
     @JsonCreator
     public VerifyDomainProxyRequestBody(
-            @JsonProperty("domain_id") Optional<? extends String> domainId,
-            @JsonProperty("proxy_url") Optional<? extends String> proxyUrl) {
+            @JsonProperty("domain_id") Optional<String> domainId,
+            @JsonProperty("proxy_url") Optional<String> proxyUrl) {
         Utils.checkNotNull(domainId, "domainId");
         Utils.checkNotNull(proxyUrl, "proxyUrl");
         this.domainId = domainId;
@@ -51,19 +50,17 @@ public VerifyDomainProxyRequestBody() {
     /**
      * The ID of the domain that will be updated.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> domainId() {
-        return (Optional<String>) domainId;
+        return domainId;
     }
 
     /**
      * The full URL of the proxy which will forward requests to the Clerk Frontend API for this domain. e.g. https://example.com/__clerk
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> proxyUrl() {
-        return (Optional<String>) proxyUrl;
+        return proxyUrl;
     }
 
     public final static Builder builder() {
@@ -82,7 +79,7 @@ public VerifyDomainProxyRequestBody withDomainId(String domainId) {
     /**
      * The ID of the domain that will be updated.
      */
-    public VerifyDomainProxyRequestBody withDomainId(Optional<? extends String> domainId) {
+    public VerifyDomainProxyRequestBody withDomainId(Optional<String> domainId) {
         Utils.checkNotNull(domainId, "domainId");
         this.domainId = domainId;
         return this;
@@ -100,7 +97,7 @@ public VerifyDomainProxyRequestBody withProxyUrl(String proxyUrl) {
     /**
      * The full URL of the proxy which will forward requests to the Clerk Frontend API for this domain. e.g. https://example.com/__clerk
      */
-    public VerifyDomainProxyRequestBody withProxyUrl(Optional<? extends String> proxyUrl) {
+    public VerifyDomainProxyRequestBody withProxyUrl(Optional<String> proxyUrl) {
         Utils.checkNotNull(proxyUrl, "proxyUrl");
         this.proxyUrl = proxyUrl;
         return this;
@@ -116,13 +113,13 @@ public boolean equals(java.lang.Object o) {
         }
         VerifyDomainProxyRequestBody other = (VerifyDomainProxyRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.domainId, other.domainId) &&
-            java.util.Objects.deepEquals(this.proxyUrl, other.proxyUrl);
+            Objects.deepEquals(this.domainId, other.domainId) &&
+            Objects.deepEquals(this.proxyUrl, other.proxyUrl);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             domainId,
             proxyUrl);
     }
@@ -136,9 +133,9 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> domainId = Optional.empty();
+        private Optional<String> domainId = Optional.empty();
  
-        private Optional<? extends String> proxyUrl = Optional.empty();  
+        private Optional<String> proxyUrl = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -156,7 +153,7 @@ public Builder domainId(String domainId) {
         /**
          * The ID of the domain that will be updated.
          */
-        public Builder domainId(Optional<? extends String> domainId) {
+        public Builder domainId(Optional<String> domainId) {
             Utils.checkNotNull(domainId, "domainId");
             this.domainId = domainId;
             return this;
@@ -174,7 +171,7 @@ public Builder proxyUrl(String proxyUrl) {
         /**
          * The full URL of the proxy which will forward requests to the Clerk Frontend API for this domain. e.g. https://example.com/__clerk
          */
-        public Builder proxyUrl(Optional<? extends String> proxyUrl) {
+        public Builder proxyUrl(Optional<String> proxyUrl) {
             Utils.checkNotNull(proxyUrl, "proxyUrl");
             this.proxyUrl = proxyUrl;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyDomainProxyRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyDomainProxyRequestBuilder.java
index 82df359..ba9f03e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyDomainProxyRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyDomainProxyRequestBuilder.java
@@ -4,18 +4,8 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class VerifyDomainProxyRequestBuilder {
 
@@ -26,13 +16,13 @@ public VerifyDomainProxyRequestBuilder(SDKMethodInterfaces.MethodCallVerifyDomai
         this.sdk = sdk;
     }
                 
-    public VerifyDomainProxyRequestBuilder request(VerifyDomainProxyRequestBody request) {
+    public VerifyDomainProxyRequestBuilder request(com.clerk.backend_api.models.operations.VerifyDomainProxyRequestBody request) {
         Utils.checkNotNull(request, "request");
         this.request = Optional.of(request);
         return this;
     }
 
-    public VerifyDomainProxyRequestBuilder request(Optional<? extends VerifyDomainProxyRequestBody> request) {
+    public VerifyDomainProxyRequestBuilder request(java.util.Optional<? extends com.clerk.backend_api.models.operations.VerifyDomainProxyRequestBody> request) {
         Utils.checkNotNull(request, "request");
         this.request = request;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyDomainProxyResponse.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyDomainProxyResponse.java
index b8bf4f6..05eec1e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyDomainProxyResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyDomainProxyResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.ProxyCheck;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class VerifyDomainProxyResponse implements com.clerk.backend_api.utils.Response {
+
+public class VerifyDomainProxyResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class VerifyDomainProxyResponse implements com.clerk.backend_api.utils.Re
     /**
      * Health check information about a domain's proxy configuration validation attempt.
      */
-    private Optional<? extends com.clerk.backend_api.models.components.ProxyCheck> proxyCheck;
+    private Optional<? extends ProxyCheck> proxyCheck;
 
     @JsonCreator
     public VerifyDomainProxyResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.ProxyCheck> proxyCheck) {
+            Optional<? extends ProxyCheck> proxyCheck) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.ProxyCheck> proxyCheck() {
-        return (Optional<com.clerk.backend_api.models.components.ProxyCheck>) proxyCheck;
+    public Optional<ProxyCheck> proxyCheck() {
+        return (Optional<ProxyCheck>) proxyCheck;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public VerifyDomainProxyResponse withRawResponse(HttpResponse<InputStream> rawRe
     /**
      * Health check information about a domain's proxy configuration validation attempt.
      */
-    public VerifyDomainProxyResponse withProxyCheck(com.clerk.backend_api.models.components.ProxyCheck proxyCheck) {
+    public VerifyDomainProxyResponse withProxyCheck(ProxyCheck proxyCheck) {
         Utils.checkNotNull(proxyCheck, "proxyCheck");
         this.proxyCheck = Optional.ofNullable(proxyCheck);
         return this;
@@ -137,7 +141,7 @@ public VerifyDomainProxyResponse withProxyCheck(com.clerk.backend_api.models.com
     /**
      * Health check information about a domain's proxy configuration validation attempt.
      */
-    public VerifyDomainProxyResponse withProxyCheck(Optional<? extends com.clerk.backend_api.models.components.ProxyCheck> proxyCheck) {
+    public VerifyDomainProxyResponse withProxyCheck(Optional<? extends ProxyCheck> proxyCheck) {
         Utils.checkNotNull(proxyCheck, "proxyCheck");
         this.proxyCheck = proxyCheck;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         VerifyDomainProxyResponse other = (VerifyDomainProxyResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.proxyCheck, other.proxyCheck);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.proxyCheck, other.proxyCheck);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.ProxyCheck> proxyCheck = Optional.empty();  
+        private Optional<? extends ProxyCheck> proxyCheck = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Health check information about a domain's proxy configuration validation attempt.
          */
-        public Builder proxyCheck(com.clerk.backend_api.models.components.ProxyCheck proxyCheck) {
+        public Builder proxyCheck(ProxyCheck proxyCheck) {
             Utils.checkNotNull(proxyCheck, "proxyCheck");
             this.proxyCheck = Optional.ofNullable(proxyCheck);
             return this;
@@ -230,7 +234,7 @@ public Builder proxyCheck(com.clerk.backend_api.models.components.ProxyCheck pro
         /**
          * Health check information about a domain's proxy configuration validation attempt.
          */
-        public Builder proxyCheck(Optional<? extends com.clerk.backend_api.models.components.ProxyCheck> proxyCheck) {
+        public Builder proxyCheck(Optional<? extends ProxyCheck> proxyCheck) {
             Utils.checkNotNull(proxyCheck, "proxyCheck");
             this.proxyCheck = proxyCheck;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordRequest.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordRequest.java
index c69a307..d682904 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordRequest.java
@@ -4,18 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class VerifyPasswordRequest {
 
     /**
@@ -91,13 +91,13 @@ public boolean equals(java.lang.Object o) {
         }
         VerifyPasswordRequest other = (VerifyPasswordRequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordRequestBody.java
index 776d568..e9fa329 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordRequestBody.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class VerifyPasswordRequestBody {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         VerifyPasswordRequestBody other = (VerifyPasswordRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.password, other.password);
+            Objects.deepEquals(this.password, other.password);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             password);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordRequestBuilder.java
index 1624a88..87b2d11 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordRequestBuilder.java
@@ -4,18 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.String;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class VerifyPasswordRequestBuilder {
 
@@ -27,19 +18,19 @@ public VerifyPasswordRequestBuilder(SDKMethodInterfaces.MethodCallVerifyPassword
         this.sdk = sdk;
     }
 
-    public VerifyPasswordRequestBuilder userId(String userId) {
+    public VerifyPasswordRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
     }
                 
-    public VerifyPasswordRequestBuilder requestBody(VerifyPasswordRequestBody requestBody) {
+    public VerifyPasswordRequestBuilder requestBody(com.clerk.backend_api.models.operations.VerifyPasswordRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = Optional.of(requestBody);
         return this;
     }
 
-    public VerifyPasswordRequestBuilder requestBody(Optional<? extends VerifyPasswordRequestBody> requestBody) {
+    public VerifyPasswordRequestBuilder requestBody(java.util.Optional<? extends com.clerk.backend_api.models.operations.VerifyPasswordRequestBody> requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordResponse.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordResponse.java
index a303b59..828df85 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordResponse.java
@@ -4,19 +4,22 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class VerifyPasswordResponse implements com.clerk.backend_api.utils.Response {
+
+public class VerifyPasswordResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -153,15 +156,15 @@ public boolean equals(java.lang.Object o) {
         }
         VerifyPasswordResponse other = (VerifyPasswordResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.object, other.object);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.object, other.object);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordResponseBody.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordResponseBody.java
index c4c6133..5051a6b 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordResponseBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyPasswordResponseBody.java
@@ -4,19 +4,19 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
+
 /**
  * VerifyPasswordResponseBody - The provided password was correct.
  */
@@ -25,11 +25,11 @@ public class VerifyPasswordResponseBody {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("verified")
-    private Optional<? extends Boolean> verified;
+    private Optional<Boolean> verified;
 
     @JsonCreator
     public VerifyPasswordResponseBody(
-            @JsonProperty("verified") Optional<? extends Boolean> verified) {
+            @JsonProperty("verified") Optional<Boolean> verified) {
         Utils.checkNotNull(verified, "verified");
         this.verified = verified;
     }
@@ -38,10 +38,9 @@ public VerifyPasswordResponseBody() {
         this(Optional.empty());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> verified() {
-        return (Optional<Boolean>) verified;
+        return verified;
     }
 
     public final static Builder builder() {
@@ -54,7 +53,7 @@ public VerifyPasswordResponseBody withVerified(boolean verified) {
         return this;
     }
 
-    public VerifyPasswordResponseBody withVerified(Optional<? extends Boolean> verified) {
+    public VerifyPasswordResponseBody withVerified(Optional<Boolean> verified) {
         Utils.checkNotNull(verified, "verified");
         this.verified = verified;
         return this;
@@ -70,12 +69,12 @@ public boolean equals(java.lang.Object o) {
         }
         VerifyPasswordResponseBody other = (VerifyPasswordResponseBody) o;
         return 
-            java.util.Objects.deepEquals(this.verified, other.verified);
+            Objects.deepEquals(this.verified, other.verified);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             verified);
     }
     
@@ -87,7 +86,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends Boolean> verified = Optional.empty();  
+        private Optional<Boolean> verified = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -99,7 +98,7 @@ public Builder verified(boolean verified) {
             return this;
         }
 
-        public Builder verified(Optional<? extends Boolean> verified) {
+        public Builder verified(Optional<Boolean> verified) {
             Utils.checkNotNull(verified, "verified");
             this.verified = verified;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifySessionRequest.java b/src/main/java/com/clerk/backend_api/models/operations/VerifySessionRequest.java
index bcdc8e4..82dff8e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifySessionRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifySessionRequest.java
@@ -4,18 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class VerifySessionRequest {
 
     /**
@@ -103,13 +103,13 @@ public boolean equals(java.lang.Object o) {
         }
         VerifySessionRequest other = (VerifySessionRequest) o;
         return 
-            java.util.Objects.deepEquals(this.sessionId, other.sessionId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.sessionId, other.sessionId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             sessionId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifySessionRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/VerifySessionRequestBody.java
index 3030470..77847ae 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifySessionRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifySessionRequestBody.java
@@ -4,19 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
 import java.util.Optional;
+
 /**
  * VerifySessionRequestBody - Parameters.
  */
@@ -29,11 +28,11 @@ public class VerifySessionRequestBody {
      */
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("token")
-    private Optional<? extends String> token;
+    private Optional<String> token;
 
     @JsonCreator
     public VerifySessionRequestBody(
-            @JsonProperty("token") Optional<? extends String> token) {
+            @JsonProperty("token") Optional<String> token) {
         Utils.checkNotNull(token, "token");
         this.token = token;
     }
@@ -46,10 +45,9 @@ public VerifySessionRequestBody() {
      * The JWT that is sent via the `__session` cookie from your frontend.
      * Note: this JWT must be associated with the supplied session ID.
      */
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<String> token() {
-        return (Optional<String>) token;
+        return token;
     }
 
     public final static Builder builder() {
@@ -70,7 +68,7 @@ public VerifySessionRequestBody withToken(String token) {
      * The JWT that is sent via the `__session` cookie from your frontend.
      * Note: this JWT must be associated with the supplied session ID.
      */
-    public VerifySessionRequestBody withToken(Optional<? extends String> token) {
+    public VerifySessionRequestBody withToken(Optional<String> token) {
         Utils.checkNotNull(token, "token");
         this.token = token;
         return this;
@@ -86,12 +84,12 @@ public boolean equals(java.lang.Object o) {
         }
         VerifySessionRequestBody other = (VerifySessionRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.token, other.token);
+            Objects.deepEquals(this.token, other.token);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             token);
     }
     
@@ -103,7 +101,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends String> token = Optional.empty();  
+        private Optional<String> token = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -123,7 +121,7 @@ public Builder token(String token) {
          * The JWT that is sent via the `__session` cookie from your frontend.
          * Note: this JWT must be associated with the supplied session ID.
          */
-        public Builder token(Optional<? extends String> token) {
+        public Builder token(Optional<String> token) {
             Utils.checkNotNull(token, "token");
             this.token = token;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifySessionRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/VerifySessionRequestBuilder.java
index f8f65b9..a5eddf9 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifySessionRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifySessionRequestBuilder.java
@@ -4,18 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.String;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class VerifySessionRequestBuilder {
 
@@ -27,19 +18,19 @@ public VerifySessionRequestBuilder(SDKMethodInterfaces.MethodCallVerifySession s
         this.sdk = sdk;
     }
 
-    public VerifySessionRequestBuilder sessionId(String sessionId) {
+    public VerifySessionRequestBuilder sessionId(java.lang.String sessionId) {
         Utils.checkNotNull(sessionId, "sessionId");
         this.sessionId = sessionId;
         return this;
     }
                 
-    public VerifySessionRequestBuilder requestBody(VerifySessionRequestBody requestBody) {
+    public VerifySessionRequestBuilder requestBody(com.clerk.backend_api.models.operations.VerifySessionRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = Optional.of(requestBody);
         return this;
     }
 
-    public VerifySessionRequestBuilder requestBody(Optional<? extends VerifySessionRequestBody> requestBody) {
+    public VerifySessionRequestBuilder requestBody(java.util.Optional<? extends com.clerk.backend_api.models.operations.VerifySessionRequestBody> requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifySessionResponse.java b/src/main/java/com/clerk/backend_api/models/operations/VerifySessionResponse.java
index 4ed6f9e..9c32b8e 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifySessionResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifySessionResponse.java
@@ -4,19 +4,23 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.models.components.Session;
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class VerifySessionResponse implements com.clerk.backend_api.utils.Response {
+
+public class VerifySessionResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -36,14 +40,14 @@ public class VerifySessionResponse implements com.clerk.backend_api.utils.Respon
     /**
      * Success
      */
-    private Optional<? extends com.clerk.backend_api.models.components.Session> session;
+    private Optional<? extends Session> session;
 
     @JsonCreator
     public VerifySessionResponse(
             String contentType,
             int statusCode,
             HttpResponse<InputStream> rawResponse,
-            Optional<? extends com.clerk.backend_api.models.components.Session> session) {
+            Optional<? extends Session> session) {
         Utils.checkNotNull(contentType, "contentType");
         Utils.checkNotNull(statusCode, "statusCode");
         Utils.checkNotNull(rawResponse, "rawResponse");
@@ -90,8 +94,8 @@ public HttpResponse<InputStream> rawResponse() {
      */
     @SuppressWarnings("unchecked")
     @JsonIgnore
-    public Optional<com.clerk.backend_api.models.components.Session> session() {
-        return (Optional<com.clerk.backend_api.models.components.Session>) session;
+    public Optional<Session> session() {
+        return (Optional<Session>) session;
     }
 
     public final static Builder builder() {
@@ -128,7 +132,7 @@ public VerifySessionResponse withRawResponse(HttpResponse<InputStream> rawRespon
     /**
      * Success
      */
-    public VerifySessionResponse withSession(com.clerk.backend_api.models.components.Session session) {
+    public VerifySessionResponse withSession(Session session) {
         Utils.checkNotNull(session, "session");
         this.session = Optional.ofNullable(session);
         return this;
@@ -137,7 +141,7 @@ public VerifySessionResponse withSession(com.clerk.backend_api.models.components
     /**
      * Success
      */
-    public VerifySessionResponse withSession(Optional<? extends com.clerk.backend_api.models.components.Session> session) {
+    public VerifySessionResponse withSession(Optional<? extends Session> session) {
         Utils.checkNotNull(session, "session");
         this.session = session;
         return this;
@@ -153,15 +157,15 @@ public boolean equals(java.lang.Object o) {
         }
         VerifySessionResponse other = (VerifySessionResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.session, other.session);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.session, other.session);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
@@ -185,7 +189,7 @@ public final static class Builder {
  
         private HttpResponse<InputStream> rawResponse;
  
-        private Optional<? extends com.clerk.backend_api.models.components.Session> session = Optional.empty();  
+        private Optional<? extends Session> session = Optional.empty();  
         
         private Builder() {
           // force use of static builder() method
@@ -221,7 +225,7 @@ public Builder rawResponse(HttpResponse<InputStream> rawResponse) {
         /**
          * Success
          */
-        public Builder session(com.clerk.backend_api.models.components.Session session) {
+        public Builder session(Session session) {
             Utils.checkNotNull(session, "session");
             this.session = Optional.ofNullable(session);
             return this;
@@ -230,7 +234,7 @@ public Builder session(com.clerk.backend_api.models.components.Session session)
         /**
          * Success
          */
-        public Builder session(Optional<? extends com.clerk.backend_api.models.components.Session> session) {
+        public Builder session(Optional<? extends Session> session) {
             Utils.checkNotNull(session, "session");
             this.session = session;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPRequest.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPRequest.java
index 8900a74..89608bb 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPRequest.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPRequest.java
@@ -4,18 +4,18 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.SpeakeasyMetadata;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
 
+
 public class VerifyTOTPRequest {
 
     /**
@@ -91,13 +91,13 @@ public boolean equals(java.lang.Object o) {
         }
         VerifyTOTPRequest other = (VerifyTOTPRequest) o;
         return 
-            java.util.Objects.deepEquals(this.userId, other.userId) &&
-            java.util.Objects.deepEquals(this.requestBody, other.requestBody);
+            Objects.deepEquals(this.userId, other.userId) &&
+            Objects.deepEquals(this.requestBody, other.requestBody);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             userId,
             requestBody);
     }
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPRequestBody.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPRequestBody.java
index 4b882ea..be039d7 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPRequestBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPRequestBody.java
@@ -4,16 +4,15 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+
 
 public class VerifyTOTPRequestBody {
 
@@ -61,12 +60,12 @@ public boolean equals(java.lang.Object o) {
         }
         VerifyTOTPRequestBody other = (VerifyTOTPRequestBody) o;
         return 
-            java.util.Objects.deepEquals(this.code, other.code);
+            Objects.deepEquals(this.code, other.code);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             code);
     }
     
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPRequestBuilder.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPRequestBuilder.java
index ceb2361..b63b891 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPRequestBuilder.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPRequestBuilder.java
@@ -4,18 +4,9 @@
 
 package com.clerk.backend_api.models.operations;
 
-import com.clerk.backend_api.models.errors.SDKError;
-import com.clerk.backend_api.utils.LazySingletonValue;
 import com.clerk.backend_api.utils.Utils;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.lang.String;
 import java.util.Optional;
-import java.util.stream.Stream;
-import org.openapitools.jackson.nullable.JsonNullable;
-
 
 public class VerifyTOTPRequestBuilder {
 
@@ -27,19 +18,19 @@ public VerifyTOTPRequestBuilder(SDKMethodInterfaces.MethodCallVerifyTOTP sdk) {
         this.sdk = sdk;
     }
 
-    public VerifyTOTPRequestBuilder userId(String userId) {
+    public VerifyTOTPRequestBuilder userId(java.lang.String userId) {
         Utils.checkNotNull(userId, "userId");
         this.userId = userId;
         return this;
     }
                 
-    public VerifyTOTPRequestBuilder requestBody(VerifyTOTPRequestBody requestBody) {
+    public VerifyTOTPRequestBuilder requestBody(com.clerk.backend_api.models.operations.VerifyTOTPRequestBody requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = Optional.of(requestBody);
         return this;
     }
 
-    public VerifyTOTPRequestBuilder requestBody(Optional<? extends VerifyTOTPRequestBody> requestBody) {
+    public VerifyTOTPRequestBuilder requestBody(java.util.Optional<? extends com.clerk.backend_api.models.operations.VerifyTOTPRequestBody> requestBody) {
         Utils.checkNotNull(requestBody, "requestBody");
         this.requestBody = requestBody;
         return this;
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPResponse.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPResponse.java
index 654ba9b..8067fcf 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPResponse.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPResponse.java
@@ -4,19 +4,22 @@
 
 package com.clerk.backend_api.models.operations;
 
+
+import com.clerk.backend_api.utils.Response;
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
 import java.net.http.HttpResponse;
+import java.util.Objects;
 import java.util.Optional;
 
-public class VerifyTOTPResponse implements com.clerk.backend_api.utils.Response {
+
+public class VerifyTOTPResponse implements Response {
 
     /**
      * HTTP response content type for this operation
@@ -153,15 +156,15 @@ public boolean equals(java.lang.Object o) {
         }
         VerifyTOTPResponse other = (VerifyTOTPResponse) o;
         return 
-            java.util.Objects.deepEquals(this.contentType, other.contentType) &&
-            java.util.Objects.deepEquals(this.statusCode, other.statusCode) &&
-            java.util.Objects.deepEquals(this.rawResponse, other.rawResponse) &&
-            java.util.Objects.deepEquals(this.object, other.object);
+            Objects.deepEquals(this.contentType, other.contentType) &&
+            Objects.deepEquals(this.statusCode, other.statusCode) &&
+            Objects.deepEquals(this.rawResponse, other.rawResponse) &&
+            Objects.deepEquals(this.object, other.object);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             contentType,
             statusCode,
             rawResponse,
diff --git a/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPResponseBody.java b/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPResponseBody.java
index f49b780..28a5d59 100644
--- a/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPResponseBody.java
+++ b/src/main/java/com/clerk/backend_api/models/operations/VerifyTOTPResponseBody.java
@@ -4,19 +4,20 @@
 
 package com.clerk.backend_api.models.operations;
 
+
 import com.clerk.backend_api.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
-import java.lang.Deprecated;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.lang.Boolean;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Objects;
 import java.util.Optional;
+
 /**
  * VerifyTOTPResponseBody - The provided TOTP or backup code was correct.
  */
@@ -25,7 +26,7 @@ public class VerifyTOTPResponseBody {
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("verified")
-    private Optional<? extends Boolean> verified;
+    private Optional<Boolean> verified;
 
     @JsonInclude(Include.NON_ABSENT)
     @JsonProperty("code_type")
@@ -33,7 +34,7 @@ public class VerifyTOTPResponseBody {
 
     @JsonCreator
     public VerifyTOTPResponseBody(
-            @JsonProperty("verified") Optional<? extends Boolean> verified,
+            @JsonProperty("verified") Optional<Boolean> verified,
             @JsonProperty("code_type") Optional<? extends CodeType> codeType) {
         Utils.checkNotNull(verified, "verified");
         Utils.checkNotNull(codeType, "codeType");
@@ -45,10 +46,9 @@ public VerifyTOTPResponseBody() {
         this(Optional.empty(), Optional.empty());
     }
 
-    @SuppressWarnings("unchecked")
     @JsonIgnore
     public Optional<Boolean> verified() {
-        return (Optional<Boolean>) verified;
+        return verified;
     }
 
     @SuppressWarnings("unchecked")
@@ -67,7 +67,7 @@ public VerifyTOTPResponseBody withVerified(boolean verified) {
         return this;
     }
 
-    public VerifyTOTPResponseBody withVerified(Optional<? extends Boolean> verified) {
+    public VerifyTOTPResponseBody withVerified(Optional<Boolean> verified) {
         Utils.checkNotNull(verified, "verified");
         this.verified = verified;
         return this;
@@ -95,13 +95,13 @@ public boolean equals(java.lang.Object o) {
         }
         VerifyTOTPResponseBody other = (VerifyTOTPResponseBody) o;
         return 
-            java.util.Objects.deepEquals(this.verified, other.verified) &&
-            java.util.Objects.deepEquals(this.codeType, other.codeType);
+            Objects.deepEquals(this.verified, other.verified) &&
+            Objects.deepEquals(this.codeType, other.codeType);
     }
     
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(
+        return Objects.hash(
             verified,
             codeType);
     }
@@ -115,7 +115,7 @@ public String toString() {
     
     public final static class Builder {
  
-        private Optional<? extends Boolean> verified = Optional.empty();
+        private Optional<Boolean> verified = Optional.empty();
  
         private Optional<? extends CodeType> codeType = Optional.empty();  
         
@@ -129,7 +129,7 @@ public Builder verified(boolean verified) {
             return this;
         }
 
-        public Builder verified(Optional<? extends Boolean> verified) {
+        public Builder verified(Optional<Boolean> verified) {
             Utils.checkNotNull(verified, "verified");
             this.verified = verified;
             return this;
diff --git a/src/main/java/com/clerk/backend_api/utils/Options.java b/src/main/java/com/clerk/backend_api/utils/Options.java
index 15be889..a3a0f04 100644
--- a/src/main/java/com/clerk/backend_api/utils/Options.java
+++ b/src/main/java/com/clerk/backend_api/utils/Options.java
@@ -6,8 +6,6 @@
 
 import java.util.Optional;
 import java.util.List;
-import com.clerk.backend_api.utils.Utils;
-
 
 public class Options {
 
diff --git a/src/main/java/com/clerk/backend_api/utils/QueryParameters.java b/src/main/java/com/clerk/backend_api/utils/QueryParameters.java
index 7ed321a..01dd9e7 100644
--- a/src/main/java/com/clerk/backend_api/utils/QueryParameters.java
+++ b/src/main/java/com/clerk/backend_api/utils/QueryParameters.java
@@ -14,10 +14,7 @@
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
 
-import com.clerk.backend_api.utils.Utils.JsonShape;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class QueryParameters {
diff --git a/src/main/java/com/clerk/backend_api/utils/RequestBody.java b/src/main/java/com/clerk/backend_api/utils/RequestBody.java
index 0d14e62..1dd5e88 100644
--- a/src/main/java/com/clerk/backend_api/utils/RequestBody.java
+++ b/src/main/java/com/clerk/backend_api/utils/RequestBody.java
@@ -5,7 +5,6 @@
 package com.clerk.backend_api.utils;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
diff --git a/src/main/java/com/clerk/backend_api/utils/Retries.java b/src/main/java/com/clerk/backend_api/utils/Retries.java
index f9748c1..977604e 100644
--- a/src/main/java/com/clerk/backend_api/utils/Retries.java
+++ b/src/main/java/com/clerk/backend_api/utils/Retries.java
@@ -10,10 +10,7 @@
 import java.net.ConnectException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
-
 
 public class Retries {
 
diff --git a/src/main/java/com/clerk/backend_api/utils/RetryConfig.java b/src/main/java/com/clerk/backend_api/utils/RetryConfig.java
index 02b1cdb..544a9d9 100644
--- a/src/main/java/com/clerk/backend_api/utils/RetryConfig.java
+++ b/src/main/java/com/clerk/backend_api/utils/RetryConfig.java
@@ -5,8 +5,6 @@
 package com.clerk.backend_api.utils;
 
 import java.util.Optional;
-import com.clerk.backend_api.utils.Utils;
-
 
 public class RetryConfig {
 
diff --git a/src/main/java/com/clerk/backend_api/utils/Security.java b/src/main/java/com/clerk/backend_api/utils/Security.java
index ff18bdd..cf19dbf 100644
--- a/src/main/java/com/clerk/backend_api/utils/Security.java
+++ b/src/main/java/com/clerk/backend_api/utils/Security.java
@@ -4,12 +4,9 @@
 
 package com.clerk.backend_api.utils;
 
-
 import java.lang.reflect.Field;
 import java.util.Base64;
 
-import org.apache.http.message.BasicNameValuePair;
-
 public final class Security {
     
     private Security() {
diff --git a/src/main/java/com/clerk/backend_api/utils/Utils.java b/src/main/java/com/clerk/backend_api/utils/Utils.java
index a1bb81f..a247deb 100644
--- a/src/main/java/com/clerk/backend_api/utils/Utils.java
+++ b/src/main/java/com/clerk/backend_api/utils/Utils.java
@@ -551,6 +551,10 @@ private static <T> T readValue(String json, TypeReference<T> typeReference) thro
         return JSON.getMapper().readValue(json, typeReference);
     }
     
+    public static byte[] extractByteArrayFromBody(HttpResponse<InputStream> response) throws IOException {
+        return toByteArrayAndClose(response.body());   
+    }
+    
     public static byte[] toByteArrayAndClose(InputStream in) throws IOException {
         try {
             return IOUtils.toByteArray(in);