diff --git a/README.md b/README.md
index fe3fb70..892b4fa 100644
--- a/README.md
+++ b/README.md
@@ -86,11 +86,12 @@ ZhipuAiClient zhipuClient = ZhipuAiClient.builder().ofZHIPU().build();
 
 // Or set the api-key by code
 ZaiClient client = ZaiClient.builder()
+        .ofZAI()
         .apiKey("your.api.key")
         .build();
 
 // For ZHIPU AI platform https://open.bigmodel.cn/api/paas/v4/
-ZhipuAiClient zhipuClient = ZhipuAiClient.builder().apiKey("your.api.key").build();
+ZhipuAiClient zhipuClient = ZhipuAiClient.builder().ofZHIPU().apiKey("your.api.key").build();
 ```
 
 ### Client Configuration
@@ -119,6 +120,7 @@ import java.util.Arrays;
 
 // Create client
 ZaiClient client = ZaiClient.builder()
+    .ofZAI()
     .apiKey("your.api.key")
     .build();
 
@@ -273,6 +275,7 @@ public class AIController {
     
     public AIController() {
         this.zaiClient = ZaiClient.builder()
+            .ofZAI()
             .apiKey("your.api.key")
             .enableTokenCache()
             .build();
diff --git a/README_CN.md b/README_CN.md
index 3ab758f..9a17c2f 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -85,11 +85,12 @@ ZhipuAiClient zhipuClient = ZhipuAiClient.builder().ofZHIPU().build();
 
 // 或代码设置凭证
 ZaiClient client = ZaiClient.builder()
+    .ofZAI()
     .apiKey("your.api.key")
     .build();
 
 // 或为智谱AI平台 bigmodel.cn 创建客户端
-ZhipuAiClient zhipuClient = ZhipuAiClient.builder().apiKey("your.api.key").build();
+ZhipuAiClient zhipuClient = ZhipuAiClient.builder().ofZHIPU().apiKey("your.api.key").build();
 ```
 
 ### 客户端配置
@@ -118,6 +119,7 @@ import java.util.Arrays;
 
 // 创建客户端
 ZaiClient client = ZaiClient.builder()
+    .ofZAI()
     .apiKey("your.api.key")
     .build();
 
@@ -274,6 +276,7 @@ public class AIController {
     
     public AIController() {
         this.zaiClient = ZaiClient.builder()
+            .ofZAI()
             .apiKey("your.api.key")
             .enableTokenCache()
             .build();
diff --git a/samples/src/main/ai.z.openapi.samples/AgentExample.java b/samples/src/main/ai.z.openapi.samples/AgentExample.java
index 6bf5f8a..5cc1180 100644
--- a/samples/src/main/ai.z.openapi.samples/AgentExample.java
+++ b/samples/src/main/ai.z.openapi.samples/AgentExample.java
@@ -1,6 +1,7 @@
 package ai.z.openapi.samples;
 
 import ai.z.openapi.ZaiClient;
+import ai.z.openapi.ZhipuAiClient;
 import ai.z.openapi.service.agents.AgentContent;
 import ai.z.openapi.service.agents.AgentMessage;
 import ai.z.openapi.service.agents.AgentsCompletionRequest;
@@ -22,8 +23,8 @@ public class AgentExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZaiClient client = ZaiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         syncAgentCompletion(client);
     }
diff --git a/samples/src/main/ai.z.openapi.samples/AgentVideoExample.java b/samples/src/main/ai.z.openapi.samples/AgentVideoExample.java
index fa0a510..a9e517b 100644
--- a/samples/src/main/ai.z.openapi.samples/AgentVideoExample.java
+++ b/samples/src/main/ai.z.openapi.samples/AgentVideoExample.java
@@ -22,8 +22,8 @@ public class AgentVideoExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZaiClient client = ZaiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         syncAgentCompletion(client);
     }
diff --git a/samples/src/main/ai.z.openapi.samples/AudioSpeechExample.java b/samples/src/main/ai.z.openapi.samples/AudioSpeechExample.java
index 3df673a..4710b52 100644
--- a/samples/src/main/ai.z.openapi.samples/AudioSpeechExample.java
+++ b/samples/src/main/ai.z.openapi.samples/AudioSpeechExample.java
@@ -1,5 +1,6 @@
 package ai.z.openapi.samples;
 
+import ai.z.openapi.ZaiClient;
 import ai.z.openapi.ZhipuAiClient;
 import ai.z.openapi.core.Constants;
 import ai.z.openapi.service.audio.AudioSpeechRequest;
@@ -14,8 +15,8 @@ public class AudioSpeechExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZhipuAiClient client = ZhipuAiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         // Create request
         AudioSpeechRequest request = AudioSpeechRequest.builder()
diff --git a/samples/src/main/ai.z.openapi.samples/ChatAsyncCompletionExample.java b/samples/src/main/ai.z.openapi.samples/ChatAsyncCompletionExample.java
index 5239afd..bd72b64 100644
--- a/samples/src/main/ai.z.openapi.samples/ChatAsyncCompletionExample.java
+++ b/samples/src/main/ai.z.openapi.samples/ChatAsyncCompletionExample.java
@@ -1,5 +1,6 @@
 package ai.z.openapi.samples;
 
+import ai.z.openapi.ZaiClient;
 import ai.z.openapi.ZhipuAiClient;
 import ai.z.openapi.core.Constants;
 import ai.z.openapi.service.model.AsyncResultRetrieveParams;
@@ -20,8 +21,8 @@ public class ChatAsyncCompletionExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZhipuAiClient client = ZhipuAiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
         
         // Or set API Key via code
         // ZaiClient client = ZaiClient.builder()
diff --git a/samples/src/main/ai.z.openapi.samples/ChatCompletionBase64Example.java b/samples/src/main/ai.z.openapi.samples/ChatCompletionBase64Example.java
index bed8962..ae2b9fc 100644
--- a/samples/src/main/ai.z.openapi.samples/ChatCompletionBase64Example.java
+++ b/samples/src/main/ai.z.openapi.samples/ChatCompletionBase64Example.java
@@ -1,5 +1,6 @@
 package ai.z.openapi.samples;
 
+import ai.z.openapi.ZaiClient;
 import ai.z.openapi.ZhipuAiClient;
 import ai.z.openapi.service.model.ChatCompletionCreateParams;
 import ai.z.openapi.service.model.ChatCompletionResponse;
@@ -23,8 +24,8 @@ public class ChatCompletionBase64Example {
     
     public static void main(String[] args) throws IOException {
         // Create client
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZhipuAiClient client = ZhipuAiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         String file = ClassLoader.getSystemResource("grounding.png").getFile();
         byte[] bytes = Files.readAllBytes(new File(file).toPath());
diff --git a/samples/src/main/ai.z.openapi.samples/ChatCompletionExample.java b/samples/src/main/ai.z.openapi.samples/ChatCompletionExample.java
index 8a632ec..d0ab396 100644
--- a/samples/src/main/ai.z.openapi.samples/ChatCompletionExample.java
+++ b/samples/src/main/ai.z.openapi.samples/ChatCompletionExample.java
@@ -1,5 +1,6 @@
 package ai.z.openapi.samples;
 
+import ai.z.openapi.ZaiClient;
 import ai.z.openapi.ZhipuAiClient;
 import ai.z.openapi.service.model.*;
 
@@ -14,8 +15,8 @@ public class ChatCompletionExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZhipuAiClient client = ZhipuAiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         // Or set API Key via code
         // ZaiClient client = ZaiClient.builder()
diff --git a/samples/src/main/ai.z.openapi.samples/ChatCompletionMultiFileExample.java b/samples/src/main/ai.z.openapi.samples/ChatCompletionMultiFileExample.java
index 7fe8c3c..b231227 100644
--- a/samples/src/main/ai.z.openapi.samples/ChatCompletionMultiFileExample.java
+++ b/samples/src/main/ai.z.openapi.samples/ChatCompletionMultiFileExample.java
@@ -1,5 +1,6 @@
 package ai.z.openapi.samples;
 
+import ai.z.openapi.ZaiClient;
 import ai.z.openapi.ZhipuAiClient;
 import ai.z.openapi.service.model.*;
 import java.util.Arrays;
@@ -7,8 +8,10 @@
 public class ChatCompletionMultiFileExample {
 
     public static void main(String[] args) {
-        ZhipuAiClient client = ZhipuAiClient.builder()
-            .build();
+        // Create client, recommended to set API Key via environment variable
+        // export ZAI_API_KEY=your.api_key
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         ChatCompletionCreateParams request = ChatCompletionCreateParams.builder()
             .model("glm-4.6v")
diff --git a/samples/src/main/ai.z.openapi.samples/ChatCompletionStreamExample.java b/samples/src/main/ai.z.openapi.samples/ChatCompletionStreamExample.java
index 58c4caf..05fdd09 100644
--- a/samples/src/main/ai.z.openapi.samples/ChatCompletionStreamExample.java
+++ b/samples/src/main/ai.z.openapi.samples/ChatCompletionStreamExample.java
@@ -12,8 +12,8 @@ public class ChatCompletionStreamExample {
     
     public static void main(String[] args) {
         // Create client
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZaiClient client = ZaiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
         
         // Create chat request
         ChatCompletionCreateParams streamRequest = ChatCompletionCreateParams.builder()
diff --git a/samples/src/main/ai.z.openapi.samples/ChatCompletionWithCustomHeadersExample.java b/samples/src/main/ai.z.openapi.samples/ChatCompletionWithCustomHeadersExample.java
index 73b19a7..ab36308 100644
--- a/samples/src/main/ai.z.openapi.samples/ChatCompletionWithCustomHeadersExample.java
+++ b/samples/src/main/ai.z.openapi.samples/ChatCompletionWithCustomHeadersExample.java
@@ -1,5 +1,6 @@
 package ai.z.openapi.samples;
 
+import ai.z.openapi.ZaiClient;
 import ai.z.openapi.ZhipuAiClient;
 import ai.z.openapi.service.model.*;
 import ai.z.openapi.core.Constants;
@@ -17,8 +18,8 @@ public class ChatCompletionWithCustomHeadersExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZhipuAiClient client = ZhipuAiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         // Create chat request
         ChatCompletionCreateParams request = ChatCompletionCreateParams.builder()
diff --git a/samples/src/main/ai.z.openapi.samples/ChatCompletionWithMcpServerUrlExample.java b/samples/src/main/ai.z.openapi.samples/ChatCompletionWithMcpServerUrlExample.java
index 70b7c5e..9b9d7eb 100644
--- a/samples/src/main/ai.z.openapi.samples/ChatCompletionWithMcpServerUrlExample.java
+++ b/samples/src/main/ai.z.openapi.samples/ChatCompletionWithMcpServerUrlExample.java
@@ -1,5 +1,6 @@
 package ai.z.openapi.samples;
 
+import ai.z.openapi.ZaiClient;
 import ai.z.openapi.ZhipuAiClient;
 import ai.z.openapi.service.model.ChatCompletionCreateParams;
 import ai.z.openapi.service.model.ChatCompletionResponse;
@@ -24,8 +25,8 @@ public class ChatCompletionWithMcpServerUrlExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZhipuAiClient client = ZhipuAiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         // Or set API Key via code
         // ZaiClient client = ZaiClient.builder()
diff --git a/samples/src/main/ai.z.openapi.samples/CogVideoX3Example.java b/samples/src/main/ai.z.openapi.samples/CogVideoX3Example.java
index 7afff7b..a944006 100644
--- a/samples/src/main/ai.z.openapi.samples/CogVideoX3Example.java
+++ b/samples/src/main/ai.z.openapi.samples/CogVideoX3Example.java
@@ -17,8 +17,8 @@ public class CogVideoX3Example {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZaiClient client = ZaiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         // Or set API Key via code
         // ZaiClient client = ZaiClient.builder()
diff --git a/samples/src/main/ai.z.openapi.samples/CogVideoXExample.java b/samples/src/main/ai.z.openapi.samples/CogVideoXExample.java
index ed1ef07..b724be6 100644
--- a/samples/src/main/ai.z.openapi.samples/CogVideoXExample.java
+++ b/samples/src/main/ai.z.openapi.samples/CogVideoXExample.java
@@ -14,8 +14,8 @@ public class CogVideoXExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZaiClient client = ZaiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
         
         // Or set API Key via code
         // ZaiClient client = ZaiClient.builder()
diff --git a/samples/src/main/ai.z.openapi.samples/CustomClientExample.java b/samples/src/main/ai.z.openapi.samples/CustomClientExample.java
index 25f3dfa..037969b 100644
--- a/samples/src/main/ai.z.openapi.samples/CustomClientExample.java
+++ b/samples/src/main/ai.z.openapi.samples/CustomClientExample.java
@@ -28,7 +28,7 @@ public class CustomClientExample {
     public static void main(String[] args) throws Exception {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
         ZaiConfig zaiConfig = ZaiConfig.builder()
             .apiKey(System.getenv("ZAI_API_KEY"))
             .baseUrl(Constants.ZHIPU_AI_BASE_URL)
diff --git a/samples/src/main/ai.z.openapi.samples/CustomTimeoutExample.java b/samples/src/main/ai.z.openapi.samples/CustomTimeoutExample.java
index 075a90e..6b4d248 100644
--- a/samples/src/main/ai.z.openapi.samples/CustomTimeoutExample.java
+++ b/samples/src/main/ai.z.openapi.samples/CustomTimeoutExample.java
@@ -1,5 +1,6 @@
 package ai.z.openapi.samples;
 
+import ai.z.openapi.ZaiClient;
 import ai.z.openapi.ZhipuAiClient;
 import ai.z.openapi.core.Constants;
 import ai.z.openapi.service.model.ChatCompletionCreateParams;
@@ -23,8 +24,8 @@ public class CustomTimeoutExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZhipuAiClient client = ZhipuAiClient.builder()
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI()
             .networkConfig(0, 10, 30, 30, TimeUnit.SECONDS)
             .build();
 
diff --git a/samples/src/main/ai.z.openapi.samples/EmbeddingsExample.java b/samples/src/main/ai.z.openapi.samples/EmbeddingsExample.java
index acacaee..b85a29f 100644
--- a/samples/src/main/ai.z.openapi.samples/EmbeddingsExample.java
+++ b/samples/src/main/ai.z.openapi.samples/EmbeddingsExample.java
@@ -12,9 +12,10 @@
 public class EmbeddingsExample {
     
     public static void main(String[] args) {
-        // Create client
-
-        ZaiClient client = ZaiClient.builder().build();
+        // Create client, recommended to set API Key via environment variable
+        // export ZAI_API_KEY=your.api_key
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
         
         // Create embedding request
         EmbeddingCreateParams request = EmbeddingCreateParams.builder()
diff --git a/samples/src/main/ai.z.openapi.samples/FileParsingExample.java b/samples/src/main/ai.z.openapi.samples/FileParsingExample.java
index 65fcff6..ca232e2 100644
--- a/samples/src/main/ai.z.openapi.samples/FileParsingExample.java
+++ b/samples/src/main/ai.z.openapi.samples/FileParsingExample.java
@@ -10,16 +10,11 @@
 public class FileParsingExample {
 
     public static void main(String[] args) {
-// It's recommended to set the API Key via environment variable
-// export ZAI_API_KEY=your.api_key
-// ZaiClient client = ZaiClient.builder().build();
 
-// You can also specify the API Key directly in code
-
-
-        ZaiClient client = ZaiClient.builder()
-                .apiKey("API Key")
-                .build();
+        // Create client, recommended to set API Key via environment variable
+        // export ZAI_API_KEY=your.api_key
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         try {
             // Example 1: Create a file parsing task
diff --git a/samples/src/main/ai.z.openapi.samples/FileParsingSyncExample.java b/samples/src/main/ai.z.openapi.samples/FileParsingSyncExample.java
index 2e4e930..7f12d77 100644
--- a/samples/src/main/ai.z.openapi.samples/FileParsingSyncExample.java
+++ b/samples/src/main/ai.z.openapi.samples/FileParsingSyncExample.java
@@ -8,14 +8,12 @@
 public class FileParsingSyncExample {
 
     public static void main(String[] args) {
-        // It is recommended to set the API Key using an environment variable
+        // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // ZaiClient client = ZaiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
 
         // Alternatively, the API Key can be specified directly in the code
-        ZaiClient client = ZaiClient.builder()
-                .apiKey("API Key")
-                .build();
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         try {
             System.out.println("=== Example: Creating file parsing task ===");
diff --git a/samples/src/main/ai.z.openapi.samples/FunctionCallingExample.java b/samples/src/main/ai.z.openapi.samples/FunctionCallingExample.java
index f432dc4..f2f4b9a 100644
--- a/samples/src/main/ai.z.openapi.samples/FunctionCallingExample.java
+++ b/samples/src/main/ai.z.openapi.samples/FunctionCallingExample.java
@@ -28,7 +28,10 @@ public static Map<String, Object> getStockPrice(String symbol) {
     }
 
     public static void main(String[] args) {
-        ZaiClient client = ZaiClient.builder().build();
+        // Create client, recommended to set API Key via environment variable
+        // export ZAI_API_KEY=your.api_key
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         // Define function tools
         Map<String, ChatFunctionParameterProperty> properties = new HashMap<>();
diff --git a/samples/src/main/ai.z.openapi.samples/GLM41VThinkingExample.java b/samples/src/main/ai.z.openapi.samples/GLM41VThinkingExample.java
index d3c0439..d07d44a 100644
--- a/samples/src/main/ai.z.openapi.samples/GLM41VThinkingExample.java
+++ b/samples/src/main/ai.z.openapi.samples/GLM41VThinkingExample.java
@@ -14,10 +14,8 @@ public class GLM41VThinkingExample {
 
     public static void main(String[] args) {
 
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZaiClient client = ZaiClient.builder()
-                .apiKey("your.api_key")
-                .build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         ChatCompletionCreateParams request = ChatCompletionCreateParams.builder()
                 .model("glm-4.1v-thinking-flashx")
diff --git a/samples/src/main/ai.z.openapi.samples/GLM45VExample.java b/samples/src/main/ai.z.openapi.samples/GLM45VExample.java
index 0358be0..2ca8d4c 100644
--- a/samples/src/main/ai.z.openapi.samples/GLM45VExample.java
+++ b/samples/src/main/ai.z.openapi.samples/GLM45VExample.java
@@ -1,5 +1,6 @@
 package ai.z.openapi.samples;
 
+import ai.z.openapi.ZaiClient;
 import ai.z.openapi.ZhipuAiClient;
 import ai.z.openapi.core.Constants;
 import ai.z.openapi.service.model.ChatCompletionCreateParams;
@@ -21,8 +22,8 @@ public class GLM45VExample {
     
     public static void main(String[] args) throws IOException {
         // Create client
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZhipuAiClient client = ZhipuAiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         // Create chat request
         ChatCompletionCreateParams streamRequest = ChatCompletionCreateParams.builder()
diff --git a/samples/src/main/ai.z.openapi.samples/GLM4VPlusExample.java b/samples/src/main/ai.z.openapi.samples/GLM4VPlusExample.java
index 3f44b89..f217ab3 100644
--- a/samples/src/main/ai.z.openapi.samples/GLM4VPlusExample.java
+++ b/samples/src/main/ai.z.openapi.samples/GLM4VPlusExample.java
@@ -14,8 +14,10 @@ public class GLM4VPlusExample {
 
     public static void main(String[] args) {
 
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZaiClient client = ZaiClient.builder().apiKey("your.api_key").build();
+        // Create client, recommended to set API Key via environment variable
+        // export ZAI_API_KEY=your.api_key
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().apiKey("your.api_key").build();
 
         ChatCompletionCreateParams request = ChatCompletionCreateParams.builder()
                 .model("glm-4v-plus-0111")
diff --git a/samples/src/main/ai.z.openapi.samples/HandwritingOcrExample.java b/samples/src/main/ai.z.openapi.samples/HandwritingOcrExample.java
index a837a8a..06cb6e7 100644
--- a/samples/src/main/ai.z.openapi.samples/HandwritingOcrExample.java
+++ b/samples/src/main/ai.z.openapi.samples/HandwritingOcrExample.java
@@ -9,14 +9,12 @@
 public class HandwritingOcrExample {
 
 	public static void main(String[] args) {
-		// It is recommended to set the API Key via environment variable
+		// Create client, recommended to set API Key via environment variable
 		// export ZAI_API_KEY=your.api_key
-		// ZaiClient client = ZaiClient.builder().build();
+		// for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
 
 		// You can also set the API Key directly in the code for testing
-		ZaiClient client = ZaiClient.builder()
-				 .apiKey("your-real-api-key")
-				.build();
+		ZaiClient client = ZaiClient.builder().ofZAI().build();
 
 		try {
 			System.out.println("=== Handwriting OCR Example ===");
diff --git a/samples/src/main/ai.z.openapi.samples/ImageGenerationExample.java b/samples/src/main/ai.z.openapi.samples/ImageGenerationExample.java
index 7f8a11f..f580ebb 100644
--- a/samples/src/main/ai.z.openapi.samples/ImageGenerationExample.java
+++ b/samples/src/main/ai.z.openapi.samples/ImageGenerationExample.java
@@ -13,8 +13,8 @@ public class ImageGenerationExample {
     
     public static void main(String[] args) {
         // Create client
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZaiClient client = ZaiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
         
         // Create image generation request
         CreateImageRequest request = CreateImageRequest.builder()
diff --git a/samples/src/main/ai.z.openapi.samples/ModerationExample.java b/samples/src/main/ai.z.openapi.samples/ModerationExample.java
index 0f3cf8b..95b5a7e 100644
--- a/samples/src/main/ai.z.openapi.samples/ModerationExample.java
+++ b/samples/src/main/ai.z.openapi.samples/ModerationExample.java
@@ -13,8 +13,10 @@
 public class ModerationExample {
     
     public static void main(String[] args) {
-        // Create client
-        ZaiClient client = ZaiClient.builder().build();
+        // Create client, recommended to set API Key via environment variable
+        // export ZAI_API_KEY=your.api_key
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
         
         // Example 1: Text moderation
         System.out.println("=== Text Moderation Example ===");
diff --git a/samples/src/main/ai.z.openapi.samples/ViduAspectVideoExample.java b/samples/src/main/ai.z.openapi.samples/ViduAspectVideoExample.java
index 9104d1b..e6fa03e 100644
--- a/samples/src/main/ai.z.openapi.samples/ViduAspectVideoExample.java
+++ b/samples/src/main/ai.z.openapi.samples/ViduAspectVideoExample.java
@@ -16,8 +16,8 @@ public class ViduAspectVideoExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZaiClient client = ZaiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         generateVideoStartEnd(client);
         client.close();
diff --git a/samples/src/main/ai.z.openapi.samples/ViduImageToVideoExample.java b/samples/src/main/ai.z.openapi.samples/ViduImageToVideoExample.java
index 3c56b87..fde78b0 100644
--- a/samples/src/main/ai.z.openapi.samples/ViduImageToVideoExample.java
+++ b/samples/src/main/ai.z.openapi.samples/ViduImageToVideoExample.java
@@ -14,8 +14,8 @@ public class ViduImageToVideoExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZaiClient client = ZaiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         generateVideoFromImage(client);
         client.close();
diff --git a/samples/src/main/ai.z.openapi.samples/ViduStartEndVideoExample.java b/samples/src/main/ai.z.openapi.samples/ViduStartEndVideoExample.java
index f9b63cc..b6e5b0d 100644
--- a/samples/src/main/ai.z.openapi.samples/ViduStartEndVideoExample.java
+++ b/samples/src/main/ai.z.openapi.samples/ViduStartEndVideoExample.java
@@ -16,8 +16,8 @@ public class ViduStartEndVideoExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZaiClient client = ZaiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         generateVideoStartEnd(client);
         client.close();
diff --git a/samples/src/main/ai.z.openapi.samples/ViduTextToVideoExample.java b/samples/src/main/ai.z.openapi.samples/ViduTextToVideoExample.java
index 4e24b8e..2f5c597 100644
--- a/samples/src/main/ai.z.openapi.samples/ViduTextToVideoExample.java
+++ b/samples/src/main/ai.z.openapi.samples/ViduTextToVideoExample.java
@@ -14,8 +14,8 @@ public class ViduTextToVideoExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZaiClient client = ZaiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
         
         // Or set API Key via code
         // ZaiClient client = ZaiClient.builder()
diff --git a/samples/src/main/ai.z.openapi.samples/VoiceCloneExample.java b/samples/src/main/ai.z.openapi.samples/VoiceCloneExample.java
index a301f26..138e4aa 100644
--- a/samples/src/main/ai.z.openapi.samples/VoiceCloneExample.java
+++ b/samples/src/main/ai.z.openapi.samples/VoiceCloneExample.java
@@ -22,7 +22,8 @@ public class VoiceCloneExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        ZaiClient client = ZaiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         // Or set API Key via code
         // ZaiClient client = ZaiClient.builder()
diff --git a/samples/src/main/ai.z.openapi.samples/WebReaderExample.java b/samples/src/main/ai.z.openapi.samples/WebReaderExample.java
index 0cd6ec0..61271e0 100644
--- a/samples/src/main/ai.z.openapi.samples/WebReaderExample.java
+++ b/samples/src/main/ai.z.openapi.samples/WebReaderExample.java
@@ -14,8 +14,8 @@ public class WebReaderExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZaiClient client = ZaiClient.builder().ofZHIPU().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
 
         basicWebReader(client);
     }
diff --git a/samples/src/main/ai.z.openapi.samples/WebSearchExample.java b/samples/src/main/ai.z.openapi.samples/WebSearchExample.java
index b57e250..47db2d6 100644
--- a/samples/src/main/ai.z.openapi.samples/WebSearchExample.java
+++ b/samples/src/main/ai.z.openapi.samples/WebSearchExample.java
@@ -24,8 +24,8 @@ public class WebSearchExample {
     public static void main(String[] args) {
         // Create client, recommended to set API Key via environment variable
         // export ZAI_API_KEY=your.api_key
-        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient
-        ZaiClient client = ZaiClient.builder().build();
+        // for Z.ai use the `ZaiClient`, for Zhipu AI use the ZhipuAiClient.builder().ofZHIPU().build()
+        ZaiClient client = ZaiClient.builder().ofZAI().build();
         
         // Or set API Key via code
         // ZaiClient client = ZaiClient.builder()