diff --git a/.gradle/8.14.3/checksums/checksums.lock b/.gradle/8.14.3/checksums/checksums.lock
index 93b1509..9e16ed7 100644
Binary files a/.gradle/8.14.3/checksums/checksums.lock and b/.gradle/8.14.3/checksums/checksums.lock differ
diff --git a/.gradle/8.14.3/checksums/md5-checksums.bin b/.gradle/8.14.3/checksums/md5-checksums.bin
index 2eb3edf..24f4b45 100644
Binary files a/.gradle/8.14.3/checksums/md5-checksums.bin and b/.gradle/8.14.3/checksums/md5-checksums.bin differ
diff --git a/.gradle/8.14.3/checksums/sha1-checksums.bin b/.gradle/8.14.3/checksums/sha1-checksums.bin
index ce69d43..62857e3 100644
Binary files a/.gradle/8.14.3/checksums/sha1-checksums.bin and b/.gradle/8.14.3/checksums/sha1-checksums.bin differ
diff --git a/.gradle/8.14.3/executionHistory/executionHistory.bin b/.gradle/8.14.3/executionHistory/executionHistory.bin
index 6eeeed4..7902f07 100644
Binary files a/.gradle/8.14.3/executionHistory/executionHistory.bin and b/.gradle/8.14.3/executionHistory/executionHistory.bin differ
diff --git a/.gradle/8.14.3/executionHistory/executionHistory.lock b/.gradle/8.14.3/executionHistory/executionHistory.lock
index 8583823..866f9cc 100644
Binary files a/.gradle/8.14.3/executionHistory/executionHistory.lock and b/.gradle/8.14.3/executionHistory/executionHistory.lock differ
diff --git a/.gradle/8.14.3/fileHashes/fileHashes.bin b/.gradle/8.14.3/fileHashes/fileHashes.bin
index f107b60..7bf2efb 100644
Binary files a/.gradle/8.14.3/fileHashes/fileHashes.bin and b/.gradle/8.14.3/fileHashes/fileHashes.bin differ
diff --git a/.gradle/8.14.3/fileHashes/fileHashes.lock b/.gradle/8.14.3/fileHashes/fileHashes.lock
index 19c09e3..9173640 100644
Binary files a/.gradle/8.14.3/fileHashes/fileHashes.lock and b/.gradle/8.14.3/fileHashes/fileHashes.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 648ed1a..2ba11a9 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
index 1fc2916..2fb7ba3 100644
--- a/.gradle/buildOutputCleanup/cache.properties
+++ b/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Fri Jul 18 22:37:14 UTC 2025
+#Thu Jul 24 19:20:25 UTC 2025
 gradle.version=8.14.3
diff --git a/README.md b/README.md
index fa9baaa..e2ade52 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Add the dependency in your `pom.xml` file:
 <dependency>
   <groupId>com.pipedream</groupId>
   <artifactId>pipedream</artifactId>
-  <version>0.0.220</version>
+  <version>0.0.237</version>
 </dependency>
 ```
 
diff --git a/build.gradle b/build.gradle
index 5744bd5..fd420e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,7 +48,7 @@ java {
 
 group = 'com.pipedream'
 
-version = '0.0.220'
+version = '0.0.237'
 
 jar {
     dependsOn(":generatePomFileForMavenPublication")
@@ -79,7 +79,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'com.pipedream'
             artifactId = 'pipedream'
-            version = '0.0.220'
+            version = '0.0.237'
             from components.java
             pom {
                 name = 'pipedream'
diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java
index 5759e8b..e6b8839 100644
--- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java
+++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java
@@ -9,7 +9,7 @@
 import com.pipedream.api.resources.oauthtokens.OauthTokensClient;
 import okhttp3.OkHttpClient;
 
-public final class AsyncBaseClientBuilder {
+public class AsyncBaseClientBuilder {
     private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder();
 
     private String clientId = System.getenv("PIPEDREAM_CLIENT_ID");
@@ -85,6 +85,11 @@ public AsyncBaseClientBuilder projectId(String projectId) {
         return this;
     }
 
+    protected ClientOptions buildClientOptions() {
+        clientOptionsBuilder.environment(this.environment);
+        return clientOptionsBuilder.build();
+    }
+
     public AsyncBaseClient build() {
         OauthTokensClient authClient = new OauthTokensClient(
                 ClientOptions.builder().environment(this.environment).build());
@@ -93,7 +98,6 @@ public AsyncBaseClient build() {
         if (projectEnvironment != null) {
             this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment);
         }
-        clientOptionsBuilder.environment(this.environment);
-        return new AsyncBaseClient(clientOptionsBuilder.build());
+        return new AsyncBaseClient(buildClientOptions());
     }
 }
diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/BaseClientBuilder.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/BaseClientBuilder.java
index 59ed177..000caa1 100644
--- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/BaseClientBuilder.java
+++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/BaseClientBuilder.java
@@ -9,7 +9,7 @@
 import com.pipedream.api.resources.oauthtokens.OauthTokensClient;
 import okhttp3.OkHttpClient;
 
-public final class BaseClientBuilder {
+public class BaseClientBuilder {
     private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder();
 
     private String clientId = System.getenv("PIPEDREAM_CLIENT_ID");
@@ -85,6 +85,11 @@ public BaseClientBuilder projectId(String projectId) {
         return this;
     }
 
+    protected ClientOptions buildClientOptions() {
+        clientOptionsBuilder.environment(this.environment);
+        return clientOptionsBuilder.build();
+    }
+
     public BaseClient build() {
         OauthTokensClient authClient = new OauthTokensClient(
                 ClientOptions.builder().environment(this.environment).build());
@@ -93,7 +98,6 @@ public BaseClient build() {
         if (projectEnvironment != null) {
             this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment);
         }
-        clientOptionsBuilder.environment(this.environment);
-        return new BaseClient(clientOptionsBuilder.build());
+        return new BaseClient(buildClientOptions());
     }
 }
diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/ClientOptions.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/ClientOptions.java
index 879c0aa..524ee4e 100644
--- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/ClientOptions.java
+++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/ClientOptions.java
@@ -37,7 +37,7 @@ private ClientOptions(
             {
                 put("X-Fern-Language", "JAVA");
                 put("X-Fern-SDK-Name", "com.pipedream.fern:api-sdk");
-                put("X-Fern-SDK-Version", "0.0.220");
+                put("X-Fern-SDK-Version", "0.0.237");
             }
         });
         this.headerSuppliers = headerSuppliers;
@@ -93,7 +93,7 @@ public static Builder builder() {
         return new Builder();
     }
 
-    public static final class Builder {
+    public static class Builder {
         private Environment environment;
 
         private final Map<String, String> headers = new HashMap<>();
@@ -182,5 +182,17 @@ public ClientOptions build() {
             return new ClientOptions(
                     environment, headers, headerSuppliers, httpClient, this.timeout.get(), this.projectId);
         }
+
+        /**
+         * Create a new Builder initialized with values from an existing ClientOptions
+         */
+        public static Builder from(ClientOptions clientOptions) {
+            Builder builder = new Builder();
+            builder.environment = clientOptions.environment();
+            builder.timeout = Optional.of(clientOptions.timeout(null));
+            builder.httpClient = clientOptions.httpClient();
+            builder.projectId = clientOptions.projectId();
+            return builder;
+        }
     }
 }
diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/RequestOptions.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/RequestOptions.java
index 559f48d..e3419b4 100644
--- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/RequestOptions.java
+++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/RequestOptions.java
@@ -57,7 +57,7 @@ public static Builder builder() {
         return new Builder();
     }
 
-    public static final class Builder {
+    public static class Builder {
         private String projectEnvironment = null;
 
         private Optional<Integer> timeout = Optional.empty();
diff --git a/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java b/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java
index 5759e8b..e6b8839 100644
--- a/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java
+++ b/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java
@@ -9,7 +9,7 @@
 import com.pipedream.api.resources.oauthtokens.OauthTokensClient;
 import okhttp3.OkHttpClient;
 
-public final class AsyncBaseClientBuilder {
+public class AsyncBaseClientBuilder {
     private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder();
 
     private String clientId = System.getenv("PIPEDREAM_CLIENT_ID");
@@ -85,6 +85,11 @@ public AsyncBaseClientBuilder projectId(String projectId) {
         return this;
     }
 
+    protected ClientOptions buildClientOptions() {
+        clientOptionsBuilder.environment(this.environment);
+        return clientOptionsBuilder.build();
+    }
+
     public AsyncBaseClient build() {
         OauthTokensClient authClient = new OauthTokensClient(
                 ClientOptions.builder().environment(this.environment).build());
@@ -93,7 +98,6 @@ public AsyncBaseClient build() {
         if (projectEnvironment != null) {
             this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment);
         }
-        clientOptionsBuilder.environment(this.environment);
-        return new AsyncBaseClient(clientOptionsBuilder.build());
+        return new AsyncBaseClient(buildClientOptions());
     }
 }
diff --git a/src/main/java/com/pipedream/api/BaseClientBuilder.java b/src/main/java/com/pipedream/api/BaseClientBuilder.java
index 59ed177..000caa1 100644
--- a/src/main/java/com/pipedream/api/BaseClientBuilder.java
+++ b/src/main/java/com/pipedream/api/BaseClientBuilder.java
@@ -9,7 +9,7 @@
 import com.pipedream.api.resources.oauthtokens.OauthTokensClient;
 import okhttp3.OkHttpClient;
 
-public final class BaseClientBuilder {
+public class BaseClientBuilder {
     private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder();
 
     private String clientId = System.getenv("PIPEDREAM_CLIENT_ID");
@@ -85,6 +85,11 @@ public BaseClientBuilder projectId(String projectId) {
         return this;
     }
 
+    protected ClientOptions buildClientOptions() {
+        clientOptionsBuilder.environment(this.environment);
+        return clientOptionsBuilder.build();
+    }
+
     public BaseClient build() {
         OauthTokensClient authClient = new OauthTokensClient(
                 ClientOptions.builder().environment(this.environment).build());
@@ -93,7 +98,6 @@ public BaseClient build() {
         if (projectEnvironment != null) {
             this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment);
         }
-        clientOptionsBuilder.environment(this.environment);
-        return new BaseClient(clientOptionsBuilder.build());
+        return new BaseClient(buildClientOptions());
     }
 }
diff --git a/src/main/java/com/pipedream/api/core/ClientOptions.java b/src/main/java/com/pipedream/api/core/ClientOptions.java
index 879c0aa..524ee4e 100644
--- a/src/main/java/com/pipedream/api/core/ClientOptions.java
+++ b/src/main/java/com/pipedream/api/core/ClientOptions.java
@@ -37,7 +37,7 @@ private ClientOptions(
             {
                 put("X-Fern-Language", "JAVA");
                 put("X-Fern-SDK-Name", "com.pipedream.fern:api-sdk");
-                put("X-Fern-SDK-Version", "0.0.220");
+                put("X-Fern-SDK-Version", "0.0.237");
             }
         });
         this.headerSuppliers = headerSuppliers;
@@ -93,7 +93,7 @@ public static Builder builder() {
         return new Builder();
     }
 
-    public static final class Builder {
+    public static class Builder {
         private Environment environment;
 
         private final Map<String, String> headers = new HashMap<>();
@@ -182,5 +182,17 @@ public ClientOptions build() {
             return new ClientOptions(
                     environment, headers, headerSuppliers, httpClient, this.timeout.get(), this.projectId);
         }
+
+        /**
+         * Create a new Builder initialized with values from an existing ClientOptions
+         */
+        public static Builder from(ClientOptions clientOptions) {
+            Builder builder = new Builder();
+            builder.environment = clientOptions.environment();
+            builder.timeout = Optional.of(clientOptions.timeout(null));
+            builder.httpClient = clientOptions.httpClient();
+            builder.projectId = clientOptions.projectId();
+            return builder;
+        }
     }
 }
diff --git a/src/main/java/com/pipedream/api/core/RequestOptions.java b/src/main/java/com/pipedream/api/core/RequestOptions.java
index 559f48d..e3419b4 100644
--- a/src/main/java/com/pipedream/api/core/RequestOptions.java
+++ b/src/main/java/com/pipedream/api/core/RequestOptions.java
@@ -57,7 +57,7 @@ public static Builder builder() {
         return new Builder();
     }
 
-    public static final class Builder {
+    public static class Builder {
         private String projectEnvironment = null;
 
         private Optional<Integer> timeout = Optional.empty();