diff --git a/openai-java-core/src/main/kotlin/com/openai/models/batches/BatchListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/batches/BatchListPage.kt
index dc7c57133..ed757ab48 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/batches/BatchListPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/batches/BatchListPage.kt
@@ -54,7 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(BatchListParams.builder().from(params).after(data().last().id()).build())
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): Optional<BatchListPage> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/batches/BatchListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/batches/BatchListPageAsync.kt
index f3a45eb88..d4f6fcc2f 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/batches/BatchListPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/batches/BatchListPageAsync.kt
@@ -54,7 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(BatchListParams.builder().from(params).after(data().last().id()).build())
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): CompletableFuture<Optional<BatchListPageAsync>> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/beta/assistants/AssistantListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/beta/assistants/AssistantListPage.kt
index 2bb70b666..c9e39876b 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/beta/assistants/AssistantListPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/beta/assistants/AssistantListPage.kt
@@ -54,9 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            AssistantListParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): Optional<AssistantListPage> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/beta/assistants/AssistantListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/beta/assistants/AssistantListPageAsync.kt
index e4f78dd26..e512c3b35 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/beta/assistants/AssistantListPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/beta/assistants/AssistantListPageAsync.kt
@@ -54,9 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            AssistantListParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): CompletableFuture<Optional<AssistantListPageAsync>> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/messages/MessageListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/messages/MessageListPage.kt
index d89334e7b..028b56674 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/messages/MessageListPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/messages/MessageListPage.kt
@@ -54,9 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            MessageListParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): Optional<MessageListPage> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/messages/MessageListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/messages/MessageListPageAsync.kt
index 894a1da70..c2a37fec5 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/messages/MessageListPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/messages/MessageListPageAsync.kt
@@ -54,9 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            MessageListParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): CompletableFuture<Optional<MessageListPageAsync>> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/RunListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/RunListPage.kt
index 430e8483e..3b170c4c4 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/RunListPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/RunListPage.kt
@@ -54,7 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(RunListParams.builder().from(params).after(data().last().id()).build())
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): Optional<RunListPage> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/RunListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/RunListPageAsync.kt
index 6ec6a277b..8ec14fa58 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/RunListPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/RunListPageAsync.kt
@@ -54,7 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(RunListParams.builder().from(params).after(data().last().id()).build())
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): CompletableFuture<Optional<RunListPageAsync>> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/steps/StepListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/steps/StepListPage.kt
index 59c12e536..799b92256 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/steps/StepListPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/steps/StepListPage.kt
@@ -54,7 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(StepListParams.builder().from(params).after(data().last().id()).build())
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): Optional<StepListPage> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/steps/StepListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/steps/StepListPageAsync.kt
index a4f51f8a8..59645a2ee 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/steps/StepListPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/steps/StepListPageAsync.kt
@@ -54,7 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(StepListParams.builder().from(params).after(data().last().id()).build())
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): CompletableFuture<Optional<StepListPageAsync>> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/ChatCompletionListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/ChatCompletionListPage.kt
index 10e370f57..c29aaad17 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/ChatCompletionListPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/ChatCompletionListPage.kt
@@ -57,9 +57,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            ChatCompletionListParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): Optional<ChatCompletionListPage> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/ChatCompletionListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/ChatCompletionListPageAsync.kt
index 64d7cef1b..cfa24163a 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/ChatCompletionListPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/ChatCompletionListPageAsync.kt
@@ -57,9 +57,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            ChatCompletionListParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): CompletableFuture<Optional<ChatCompletionListPageAsync>> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/messages/MessageListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/messages/MessageListPage.kt
index cdb14133e..51d6f0554 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/messages/MessageListPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/messages/MessageListPage.kt
@@ -58,9 +58,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            MessageListParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): Optional<MessageListPage> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/messages/MessageListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/messages/MessageListPageAsync.kt
index 2c92d0b99..946d54aa9 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/messages/MessageListPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/chat/completions/messages/MessageListPageAsync.kt
@@ -58,9 +58,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            MessageListParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): CompletableFuture<Optional<MessageListPageAsync>> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/files/FileListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/files/FileListPage.kt
index 67c981cb1..4237a5327 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/files/FileListPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/files/FileListPage.kt
@@ -54,7 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(FileListParams.builder().from(params).after(data().last().id()).build())
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): Optional<FileListPage> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/files/FileListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/files/FileListPageAsync.kt
index cb49a8ce2..84fee5853 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/files/FileListPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/files/FileListPageAsync.kt
@@ -54,7 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(FileListParams.builder().from(params).after(data().last().id()).build())
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): CompletableFuture<Optional<FileListPageAsync>> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListEventsPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListEventsPage.kt
index f1bc2f90e..3e681e8e2 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListEventsPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListEventsPage.kt
@@ -54,9 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            JobListEventsParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): Optional<JobListEventsPage> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListEventsPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListEventsPageAsync.kt
index 1916bda36..4b20238f3 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListEventsPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListEventsPageAsync.kt
@@ -54,9 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            JobListEventsParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): CompletableFuture<Optional<JobListEventsPageAsync>> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListPage.kt
index 6c77757e4..426b43daa 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListPage.kt
@@ -54,7 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(JobListParams.builder().from(params).after(data().last().id()).build())
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): Optional<JobListPage> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListPageAsync.kt
index 0c7840a94..5f1537131 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListPageAsync.kt
@@ -54,7 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(JobListParams.builder().from(params).after(data().last().id()).build())
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): CompletableFuture<Optional<JobListPageAsync>> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/checkpoints/CheckpointListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/checkpoints/CheckpointListPage.kt
index 7bbaaf554..b143b2488 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/checkpoints/CheckpointListPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/checkpoints/CheckpointListPage.kt
@@ -54,9 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            CheckpointListParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): Optional<CheckpointListPage> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/checkpoints/CheckpointListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/checkpoints/CheckpointListPageAsync.kt
index e2699f551..99a6a3e84 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/checkpoints/CheckpointListPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/checkpoints/CheckpointListPageAsync.kt
@@ -54,9 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            CheckpointListParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): CompletableFuture<Optional<CheckpointListPageAsync>> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/responses/inputitems/InputItemListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/responses/inputitems/InputItemListPage.kt
index 87506a80a..77c54c314 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/responses/inputitems/InputItemListPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/responses/inputitems/InputItemListPage.kt
@@ -10,7 +10,15 @@ import com.openai.core.ExcludeMissing
 import com.openai.core.JsonField
 import com.openai.core.JsonMissing
 import com.openai.core.JsonValue
+import com.openai.models.responses.ResponseComputerToolCall
+import com.openai.models.responses.ResponseComputerToolCallOutputItem
+import com.openai.models.responses.ResponseFileSearchToolCall
+import com.openai.models.responses.ResponseFunctionToolCallItem
+import com.openai.models.responses.ResponseFunctionToolCallOutputItem
+import com.openai.models.responses.ResponseFunctionWebSearch
+import com.openai.models.responses.ResponseInputMessageItem
 import com.openai.models.responses.ResponseItem
+import com.openai.models.responses.ResponseOutputMessage
 import com.openai.services.blocking.responses.InputItemService
 import java.util.Collections
 import java.util.Objects
@@ -56,7 +64,48 @@ private constructor(
         }
 
         return Optional.of(
-            InputItemListParams.builder().from(params).after(data().last().id()).build()
+            params
+                .toBuilder()
+                .after(
+                    data()
+                        .last()
+                        .accept(
+                            object : ResponseItem.Visitor<Optional<String>> {
+                                override fun visitResponseInputMessageItem(
+                                    responseInputMessageItem: ResponseInputMessageItem
+                                ): Optional<String> = Optional.of(responseInputMessageItem.id())
+
+                                override fun visitResponseOutputMessage(
+                                    responseOutputMessage: ResponseOutputMessage
+                                ): Optional<String> = Optional.of(responseOutputMessage.id())
+
+                                override fun visitFileSearchCall(
+                                    fileSearchCall: ResponseFileSearchToolCall
+                                ): Optional<String> = Optional.of(fileSearchCall.id())
+
+                                override fun visitComputerCall(
+                                    computerCall: ResponseComputerToolCall
+                                ): Optional<String> = Optional.of(computerCall.id())
+
+                                override fun visitComputerCallOutput(
+                                    computerCallOutput: ResponseComputerToolCallOutputItem
+                                ): Optional<String> = Optional.of(computerCallOutput.id())
+
+                                override fun visitWebSearchCall(
+                                    webSearchCall: ResponseFunctionWebSearch
+                                ): Optional<String> = Optional.of(webSearchCall.id())
+
+                                override fun visitFunctionCall(
+                                    functionCall: ResponseFunctionToolCallItem
+                                ): Optional<String> = functionCall.id()
+
+                                override fun visitFunctionCallOutput(
+                                    functionCallOutput: ResponseFunctionToolCallOutputItem
+                                ): Optional<String> = Optional.of(functionCallOutput.id())
+                            }
+                        )
+                )
+                .build()
         )
     }
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/responses/inputitems/InputItemListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/responses/inputitems/InputItemListPageAsync.kt
index fdde37f08..8ac8535ca 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/responses/inputitems/InputItemListPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/responses/inputitems/InputItemListPageAsync.kt
@@ -10,7 +10,15 @@ import com.openai.core.ExcludeMissing
 import com.openai.core.JsonField
 import com.openai.core.JsonMissing
 import com.openai.core.JsonValue
+import com.openai.models.responses.ResponseComputerToolCall
+import com.openai.models.responses.ResponseComputerToolCallOutputItem
+import com.openai.models.responses.ResponseFileSearchToolCall
+import com.openai.models.responses.ResponseFunctionToolCallItem
+import com.openai.models.responses.ResponseFunctionToolCallOutputItem
+import com.openai.models.responses.ResponseFunctionWebSearch
+import com.openai.models.responses.ResponseInputMessageItem
 import com.openai.models.responses.ResponseItem
+import com.openai.models.responses.ResponseOutputMessage
 import com.openai.services.async.responses.InputItemServiceAsync
 import java.util.Collections
 import java.util.Objects
@@ -56,7 +64,48 @@ private constructor(
         }
 
         return Optional.of(
-            InputItemListParams.builder().from(params).after(data().last().id()).build()
+            params
+                .toBuilder()
+                .after(
+                    data()
+                        .last()
+                        .accept(
+                            object : ResponseItem.Visitor<Optional<String>> {
+                                override fun visitResponseInputMessageItem(
+                                    responseInputMessageItem: ResponseInputMessageItem
+                                ): Optional<String> = Optional.of(responseInputMessageItem.id())
+
+                                override fun visitResponseOutputMessage(
+                                    responseOutputMessage: ResponseOutputMessage
+                                ): Optional<String> = Optional.of(responseOutputMessage.id())
+
+                                override fun visitFileSearchCall(
+                                    fileSearchCall: ResponseFileSearchToolCall
+                                ): Optional<String> = Optional.of(fileSearchCall.id())
+
+                                override fun visitComputerCall(
+                                    computerCall: ResponseComputerToolCall
+                                ): Optional<String> = Optional.of(computerCall.id())
+
+                                override fun visitComputerCallOutput(
+                                    computerCallOutput: ResponseComputerToolCallOutputItem
+                                ): Optional<String> = Optional.of(computerCallOutput.id())
+
+                                override fun visitWebSearchCall(
+                                    webSearchCall: ResponseFunctionWebSearch
+                                ): Optional<String> = Optional.of(webSearchCall.id())
+
+                                override fun visitFunctionCall(
+                                    functionCall: ResponseFunctionToolCallItem
+                                ): Optional<String> = functionCall.id()
+
+                                override fun visitFunctionCallOutput(
+                                    functionCallOutput: ResponseFunctionToolCallOutputItem
+                                ): Optional<String> = Optional.of(functionCallOutput.id())
+                            }
+                        )
+                )
+                .build()
         )
     }
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/VectorStoreListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/VectorStoreListPage.kt
index 581eea397..0555dff80 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/VectorStoreListPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/VectorStoreListPage.kt
@@ -54,9 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            VectorStoreListParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): Optional<VectorStoreListPage> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/VectorStoreListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/VectorStoreListPageAsync.kt
index 179c224d1..ade3c9fe9 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/VectorStoreListPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/VectorStoreListPageAsync.kt
@@ -54,9 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            VectorStoreListParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): CompletableFuture<Optional<VectorStoreListPageAsync>> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/filebatches/FileBatchListFilesPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/filebatches/FileBatchListFilesPage.kt
index 0111c0544..aaa25990b 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/filebatches/FileBatchListFilesPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/filebatches/FileBatchListFilesPage.kt
@@ -55,9 +55,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            FileBatchListFilesParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): Optional<FileBatchListFilesPage> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/filebatches/FileBatchListFilesPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/filebatches/FileBatchListFilesPageAsync.kt
index 56921c109..e0a9c5cea 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/filebatches/FileBatchListFilesPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/filebatches/FileBatchListFilesPageAsync.kt
@@ -55,9 +55,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(
-            FileBatchListFilesParams.builder().from(params).after(data().last().id()).build()
-        )
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): CompletableFuture<Optional<FileBatchListFilesPageAsync>> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/files/FileListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/files/FileListPage.kt
index 14c9d6961..24cdb601b 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/files/FileListPage.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/files/FileListPage.kt
@@ -54,7 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(FileListParams.builder().from(params).after(data().last().id()).build())
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): Optional<FileListPage> {
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/files/FileListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/files/FileListPageAsync.kt
index aee88683c..b90239d21 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/files/FileListPageAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/vectorstores/files/FileListPageAsync.kt
@@ -54,7 +54,7 @@ private constructor(
             return Optional.empty()
         }
 
-        return Optional.of(FileListParams.builder().from(params).after(data().last().id()).build())
+        return Optional.of(params.toBuilder().after(data().last().id()).build())
     }
 
     fun getNextPage(): CompletableFuture<Optional<FileListPageAsync>> {