diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 904b037e5..5a8dc58d0 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "0.7.4"
+  ".": "0.7.5"
 }
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63b41aaa5..472369551 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.7.5 (2024-12-13)
+
+Full Changelog: [v0.7.4...v0.7.5](https://github.com/openai/openai-java/compare/v0.7.4...v0.7.5)
+
+### Chores
+
+* **internal:** remove unused and expand used wildcard imports ([#43](https://github.com/openai/openai-java/issues/43)) ([39bfc4e](https://github.com/openai/openai-java/commit/39bfc4e4a15ce52c029ed31253afff9d9de36cc1))
+* **internal:** remove unused and expand used wildcard imports ([#44](https://github.com/openai/openai-java/issues/44)) ([7f7e131](https://github.com/openai/openai-java/commit/7f7e1313bde6827cd9067b712f3d7992ddeeaa6f))
+* **test:** use `JsonValue` instead of `JsonString` ([#41](https://github.com/openai/openai-java/issues/41)) ([8d2dd03](https://github.com/openai/openai-java/commit/8d2dd030899ad807a4712e00a33426c7484bcab5))
+
 ## 0.7.4 (2024-12-12)
 
 Full Changelog: [v0.7.3...v0.7.4](https://github.com/openai/openai-java/compare/v0.7.3...v0.7.4)
diff --git a/README.md b/README.md
index cac488e71..e93a878dc 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 <!-- x-release-please-start-version -->
 
-[![Maven Central](https://img.shields.io/maven-central/v/com.openai/openai-java)](https://central.sonatype.com/artifact/com.openai/openai-java/0.7.4)
+[![Maven Central](https://img.shields.io/maven-central/v/com.openai/openai-java)](https://central.sonatype.com/artifact/com.openai/openai-java/0.7.5)
 
 <!-- x-release-please-end -->
 
@@ -30,7 +30,7 @@ The REST API documentation can be found on [platform.openai.com](https://platfo
 <!-- x-release-please-start-version -->
 
 ```kotlin
-implementation("com.openai:openai-java:0.7.4")
+implementation("com.openai:openai-java:0.7.5")
 ```
 
 #### Maven
@@ -39,7 +39,7 @@ implementation("com.openai:openai-java:0.7.4")
 <dependency>
     <groupId>com.openai</groupId>
     <artifactId>openai-java</artifactId>
-    <version>0.7.4</version>
+    <version>0.7.5</version>
 </dependency>
 ```
 
diff --git a/build.gradle.kts b/build.gradle.kts
index a550f1e3d..121501366 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 allprojects {
     group = "com.openai"
-    version = "0.7.4" // x-release-please-version
+    version = "0.7.5" // x-release-please-version
 }
 
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClient.kt b/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClient.kt
index 14f5bc42e..1dce1fed7 100644
--- a/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClient.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClient.kt
@@ -2,8 +2,16 @@
 
 package com.openai.client
 
-import com.openai.models.*
-import com.openai.services.blocking.*
+import com.openai.services.blocking.BatchService
+import com.openai.services.blocking.ChatService
+import com.openai.services.blocking.CompletionService
+import com.openai.services.blocking.EmbeddingService
+import com.openai.services.blocking.FileService
+import com.openai.services.blocking.FineTuningService
+import com.openai.services.blocking.ImageService
+import com.openai.services.blocking.ModelService
+import com.openai.services.blocking.ModerationService
+import com.openai.services.blocking.UploadService
 
 interface OpenAIClient {
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientAsync.kt b/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientAsync.kt
index d3e0e07ff..88af19447 100644
--- a/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientAsync.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientAsync.kt
@@ -2,8 +2,16 @@
 
 package com.openai.client
 
-import com.openai.models.*
-import com.openai.services.async.*
+import com.openai.services.async.BatchServiceAsync
+import com.openai.services.async.ChatServiceAsync
+import com.openai.services.async.CompletionServiceAsync
+import com.openai.services.async.EmbeddingServiceAsync
+import com.openai.services.async.FileServiceAsync
+import com.openai.services.async.FineTuningServiceAsync
+import com.openai.services.async.ImageServiceAsync
+import com.openai.services.async.ModelServiceAsync
+import com.openai.services.async.ModerationServiceAsync
+import com.openai.services.async.UploadServiceAsync
 
 interface OpenAIClientAsync {
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientAsyncImpl.kt
index 56bc538df..9a14f773a 100644
--- a/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientAsyncImpl.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientAsyncImpl.kt
@@ -4,8 +4,26 @@ package com.openai.client
 
 import com.openai.core.ClientOptions
 import com.openai.core.getPackageVersion
-import com.openai.models.*
-import com.openai.services.async.*
+import com.openai.services.async.BatchServiceAsync
+import com.openai.services.async.BatchServiceAsyncImpl
+import com.openai.services.async.ChatServiceAsync
+import com.openai.services.async.ChatServiceAsyncImpl
+import com.openai.services.async.CompletionServiceAsync
+import com.openai.services.async.CompletionServiceAsyncImpl
+import com.openai.services.async.EmbeddingServiceAsync
+import com.openai.services.async.EmbeddingServiceAsyncImpl
+import com.openai.services.async.FileServiceAsync
+import com.openai.services.async.FileServiceAsyncImpl
+import com.openai.services.async.FineTuningServiceAsync
+import com.openai.services.async.FineTuningServiceAsyncImpl
+import com.openai.services.async.ImageServiceAsync
+import com.openai.services.async.ImageServiceAsyncImpl
+import com.openai.services.async.ModelServiceAsync
+import com.openai.services.async.ModelServiceAsyncImpl
+import com.openai.services.async.ModerationServiceAsync
+import com.openai.services.async.ModerationServiceAsyncImpl
+import com.openai.services.async.UploadServiceAsync
+import com.openai.services.async.UploadServiceAsyncImpl
 
 class OpenAIClientAsyncImpl
 constructor(
diff --git a/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientImpl.kt b/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientImpl.kt
index e0bf9a44d..8fd7ffe05 100644
--- a/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientImpl.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientImpl.kt
@@ -4,8 +4,26 @@ package com.openai.client
 
 import com.openai.core.ClientOptions
 import com.openai.core.getPackageVersion
-import com.openai.models.*
-import com.openai.services.blocking.*
+import com.openai.services.blocking.BatchService
+import com.openai.services.blocking.BatchServiceImpl
+import com.openai.services.blocking.ChatService
+import com.openai.services.blocking.ChatServiceImpl
+import com.openai.services.blocking.CompletionService
+import com.openai.services.blocking.CompletionServiceImpl
+import com.openai.services.blocking.EmbeddingService
+import com.openai.services.blocking.EmbeddingServiceImpl
+import com.openai.services.blocking.FileService
+import com.openai.services.blocking.FileServiceImpl
+import com.openai.services.blocking.FineTuningService
+import com.openai.services.blocking.FineTuningServiceImpl
+import com.openai.services.blocking.ImageService
+import com.openai.services.blocking.ImageServiceImpl
+import com.openai.services.blocking.ModelService
+import com.openai.services.blocking.ModelServiceImpl
+import com.openai.services.blocking.ModerationService
+import com.openai.services.blocking.ModerationServiceImpl
+import com.openai.services.blocking.UploadService
+import com.openai.services.blocking.UploadServiceImpl
 
 class OpenAIClientImpl
 constructor(
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt
index 077f37adc..5492f57b6 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt
@@ -7,7 +7,6 @@ import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.core.toImmutable
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt
index debe5e0fa..a2ba22b54 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt
@@ -16,7 +16,6 @@ import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.core.toImmutable
 import com.openai.errors.OpenAIInvalidDataException
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt
index 5931f5ab5..648c0c976 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt
@@ -5,7 +5,6 @@ package com.openai.models
 import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt
index 31ae31659..d945a6730 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt
@@ -5,7 +5,6 @@ package com.openai.models
 import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
-import com.openai.models.*
 import java.util.Objects
 
 class BatchRetrieveParams
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionCreateParams.kt
index 6b0ec6d49..fee77b4b6 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionCreateParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionCreateParams.kt
@@ -25,7 +25,6 @@ import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.core.toImmutable
 import com.openai.errors.OpenAIInvalidDataException
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/CompletionCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/CompletionCreateParams.kt
index 329fea123..aca4bc01b 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/CompletionCreateParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/CompletionCreateParams.kt
@@ -25,7 +25,6 @@ import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.core.toImmutable
 import com.openai.errors.OpenAIInvalidDataException
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/EmbeddingCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/EmbeddingCreateParams.kt
index 9c5f13b61..f3b270717 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/EmbeddingCreateParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/EmbeddingCreateParams.kt
@@ -25,7 +25,6 @@ import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.core.toImmutable
 import com.openai.errors.OpenAIInvalidDataException
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileDeleteParams.kt
index dd693376d..baee63d08 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/FileDeleteParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/FileDeleteParams.kt
@@ -7,7 +7,6 @@ import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.core.toImmutable
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt
index 1f9410efc..a6eb94b8e 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt
@@ -9,7 +9,6 @@ import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.errors.OpenAIInvalidDataException
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileRetrieveParams.kt
index 3ee4d2cea..734401aac 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/FileRetrieveParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/FileRetrieveParams.kt
@@ -5,7 +5,6 @@ package com.openai.models
 import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
-import com.openai.models.*
 import java.util.Objects
 
 class FileRetrieveParams
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCancelParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCancelParams.kt
index c1c3e2214..fedfa4a19 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCancelParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCancelParams.kt
@@ -7,7 +7,6 @@ import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.core.toImmutable
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListParams.kt
index cdeba1056..95b3dde64 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListParams.kt
@@ -5,7 +5,6 @@ package com.openai.models
 import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCreateParams.kt
index 0d08c6715..1e19eb7cd 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCreateParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCreateParams.kt
@@ -25,7 +25,6 @@ import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.core.toImmutable
 import com.openai.errors.OpenAIInvalidDataException
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsParams.kt
index cb7d95124..6886ea2b1 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsParams.kt
@@ -5,7 +5,6 @@ package com.openai.models
 import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt
index eb4e7af87..d977f23be 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt
@@ -5,7 +5,6 @@ package com.openai.models
 import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobRetrieveParams.kt
index b025cdd4b..81da1251e 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobRetrieveParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobRetrieveParams.kt
@@ -5,7 +5,6 @@ package com.openai.models
 import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
-import com.openai.models.*
 import java.util.Objects
 
 class FineTuningJobRetrieveParams
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ImageGenerateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ImageGenerateParams.kt
index 0aae90847..3fca4269e 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/ImageGenerateParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/ImageGenerateParams.kt
@@ -16,7 +16,6 @@ import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.core.toImmutable
 import com.openai.errors.OpenAIInvalidDataException
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleteParams.kt
index 1a98bc46e..60ec2d47b 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleteParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleteParams.kt
@@ -7,7 +7,6 @@ import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.core.toImmutable
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt
index 5c844b834..ba66ddb0e 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt
@@ -5,7 +5,6 @@ package com.openai.models
 import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
-import com.openai.models.*
 import java.util.Objects
 
 class ModelListParams
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModelRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModelRetrieveParams.kt
index 48bc296ce..028780705 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/ModelRetrieveParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/ModelRetrieveParams.kt
@@ -5,7 +5,6 @@ package com.openai.models
 import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
-import com.openai.models.*
 import java.util.Objects
 
 class ModelRetrieveParams
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateParams.kt
index 89aaaba65..a1f465cf6 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateParams.kt
@@ -22,7 +22,6 @@ import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.core.toImmutable
 import com.openai.errors.OpenAIInvalidDataException
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/UploadCancelParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/UploadCancelParams.kt
index 4d993018a..21a09b146 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/UploadCancelParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/UploadCancelParams.kt
@@ -7,7 +7,6 @@ import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.core.toImmutable
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/UploadCompleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/UploadCompleteParams.kt
index 0e97dbe81..8a168e91c 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/UploadCompleteParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/UploadCompleteParams.kt
@@ -12,7 +12,6 @@ import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.core.toImmutable
-import com.openai.models.*
 import java.util.Objects
 import java.util.Optional
 
diff --git a/openai-java-core/src/main/kotlin/com/openai/models/UploadCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/UploadCreateParams.kt
index e6a4f6e72..4030f5c98 100644
--- a/openai-java-core/src/main/kotlin/com/openai/models/UploadCreateParams.kt
+++ b/openai-java-core/src/main/kotlin/com/openai/models/UploadCreateParams.kt
@@ -12,7 +12,6 @@ import com.openai.core.NoAutoDetect
 import com.openai.core.http.Headers
 import com.openai.core.http.QueryParams
 import com.openai.core.toImmutable
-import com.openai.models.*
 import java.util.Objects
 
 class UploadCreateParams
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BatchCancelParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BatchCancelParamsTest.kt
index 430cf0e42..c1b46775f 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/BatchCancelParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/BatchCancelParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BatchCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BatchCreateParamsTest.kt
index bbb81418b..097da0fb3 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/BatchCreateParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/BatchCreateParamsTest.kt
@@ -3,7 +3,6 @@
 package com.openai.models
 
 import com.openai.core.JsonValue
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BatchListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BatchListParamsTest.kt
index bddddae85..67b80dc60 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/BatchListParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/BatchListParamsTest.kt
@@ -3,7 +3,6 @@
 package com.openai.models
 
 import com.openai.core.http.QueryParams
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BatchRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BatchRetrieveParamsTest.kt
index 18431f44f..8c2c910bf 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/BatchRetrieveParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/BatchRetrieveParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/ChatCompletionCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/ChatCompletionCreateParamsTest.kt
index ffc1f055b..37323a90e 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/ChatCompletionCreateParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/ChatCompletionCreateParamsTest.kt
@@ -3,7 +3,6 @@
 package com.openai.models
 
 import com.openai.core.JsonValue
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/CompletionCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/CompletionCreateParamsTest.kt
index a1419ce9d..e5f18362c 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/CompletionCreateParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/CompletionCreateParamsTest.kt
@@ -3,7 +3,6 @@
 package com.openai.models
 
 import com.openai.core.JsonValue
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/EmbeddingCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/EmbeddingCreateParamsTest.kt
index b2b8eb8d9..cec9739db 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/EmbeddingCreateParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/EmbeddingCreateParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FileDeleteParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FileDeleteParamsTest.kt
index 94673cff9..4ba95c51c 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/FileDeleteParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/FileDeleteParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FileListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FileListParamsTest.kt
index 91e237665..0ac2a0b51 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/FileListParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/FileListParamsTest.kt
@@ -3,7 +3,6 @@
 package com.openai.models
 
 import com.openai.core.http.QueryParams
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FileRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FileRetrieveParamsTest.kt
index 79b27d39b..c75609415 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/FileRetrieveParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/FileRetrieveParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCancelParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCancelParamsTest.kt
index d284ac3ec..5191b8a24 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCancelParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCancelParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCheckpointListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCheckpointListParamsTest.kt
index be811c939..b6733ecba 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCheckpointListParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCheckpointListParamsTest.kt
@@ -3,7 +3,6 @@
 package com.openai.models
 
 import com.openai.core.http.QueryParams
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCreateParamsTest.kt
index 655e2b676..441d8ead2 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCreateParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCreateParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListEventsParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListEventsParamsTest.kt
index a74751fad..71251b983 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListEventsParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListEventsParamsTest.kt
@@ -3,7 +3,6 @@
 package com.openai.models
 
 import com.openai.core.http.QueryParams
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListParamsTest.kt
index 781e6025e..3fb723e38 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListParamsTest.kt
@@ -3,7 +3,6 @@
 package com.openai.models
 
 import com.openai.core.http.QueryParams
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobRetrieveParamsTest.kt
index 52d4d0ce2..6573901ad 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobRetrieveParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobRetrieveParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/ImageGenerateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/ImageGenerateParamsTest.kt
index 73e9e7abb..957276678 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/ImageGenerateParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/ImageGenerateParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/ModelDeleteParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/ModelDeleteParamsTest.kt
index 029098bc9..7f20f4db1 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/ModelDeleteParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/ModelDeleteParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/ModelListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/ModelListParamsTest.kt
index 84d6ea071..e54e80437 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/ModelListParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/ModelListParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.junit.jupiter.api.Test
 
 class ModelListParamsTest {
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/ModelRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/ModelRetrieveParamsTest.kt
index 9f3de1d34..fd3f32f71 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/ModelRetrieveParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/ModelRetrieveParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/ModerationCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/ModerationCreateParamsTest.kt
index a005fb75a..d0ce47a7d 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/ModerationCreateParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/ModerationCreateParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/UploadCancelParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/UploadCancelParamsTest.kt
index e5f4217ee..e77b71aa8 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/UploadCancelParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/UploadCancelParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/UploadCompleteParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/UploadCompleteParamsTest.kt
index 93dd4ca82..1bda1ce23 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/UploadCompleteParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/UploadCompleteParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/models/UploadCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/UploadCreateParamsTest.kt
index 6498a3cf7..4adb31471 100644
--- a/openai-java-core/src/test/kotlin/com/openai/models/UploadCreateParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/models/UploadCreateParamsTest.kt
@@ -2,7 +2,6 @@
 
 package com.openai.models
 
-import com.openai.models.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/services/ErrorHandlingTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/ErrorHandlingTest.kt
index 1a009f997..9b63239fd 100644
--- a/openai-java-core/src/test/kotlin/com/openai/services/ErrorHandlingTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/services/ErrorHandlingTest.kt
@@ -12,7 +12,7 @@ import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo
 import com.github.tomakehurst.wiremock.junit5.WireMockTest
 import com.openai.client.OpenAIClient
 import com.openai.client.okhttp.OpenAIOkHttpClient
-import com.openai.core.JsonString
+import com.openai.core.JsonValue
 import com.openai.core.http.Headers
 import com.openai.core.jsonMapper
 import com.openai.errors.BadRequestException
@@ -25,7 +25,10 @@ import com.openai.errors.RateLimitException
 import com.openai.errors.UnauthorizedException
 import com.openai.errors.UnexpectedStatusCodeException
 import com.openai.errors.UnprocessableEntityException
-import com.openai.models.*
+import com.openai.models.FineTuningJob
+import com.openai.models.FineTuningJobCreateParams
+import com.openai.models.FineTuningJobWandbIntegration
+import com.openai.models.FineTuningJobWandbIntegrationObject
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.assertj.core.api.InstanceOfAssertFactories
@@ -38,7 +41,7 @@ class ErrorHandlingTest {
     private val JSON_MAPPER: JsonMapper = jsonMapper()
 
     private val OPENAI_ERROR: OpenAIError =
-        OpenAIError.builder().putAdditionalProperty("key", JsonString.of("value")).build()
+        OpenAIError.builder().putAdditionalProperty("key", JsonValue.from("value")).build()
 
     private lateinit var client: OpenAIClient
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/services/ServiceParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/ServiceParamsTest.kt
index 3cbf605f8..86481f8e8 100644
--- a/openai-java-core/src/test/kotlin/com/openai/services/ServiceParamsTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/services/ServiceParamsTest.kt
@@ -15,10 +15,27 @@ import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo
 import com.github.tomakehurst.wiremock.junit5.WireMockTest
 import com.openai.client.OpenAIClient
 import com.openai.client.okhttp.OpenAIOkHttpClient
-import com.openai.core.JsonString
 import com.openai.core.JsonValue
 import com.openai.core.jsonMapper
-import com.openai.models.*
+import com.openai.models.ChatCompletion
+import com.openai.models.ChatCompletionAudio
+import com.openai.models.ChatCompletionAudioParam
+import com.openai.models.ChatCompletionCreateParams
+import com.openai.models.ChatCompletionMessage
+import com.openai.models.ChatCompletionMessageParam
+import com.openai.models.ChatCompletionMessageToolCall
+import com.openai.models.ChatCompletionModality
+import com.openai.models.ChatCompletionPredictionContent
+import com.openai.models.ChatCompletionStreamOptions
+import com.openai.models.ChatCompletionSystemMessageParam
+import com.openai.models.ChatCompletionTokenLogprob
+import com.openai.models.ChatCompletionTool
+import com.openai.models.ChatCompletionToolChoiceOption
+import com.openai.models.ChatModel
+import com.openai.models.CompletionUsage
+import com.openai.models.FunctionDefinition
+import com.openai.models.FunctionParameters
+import com.openai.models.ResponseFormatText
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
@@ -52,7 +69,7 @@ class ServiceParamsTest {
 
         val additionalBodyProperties = mutableMapOf<String, JsonValue>()
 
-        additionalBodyProperties.put("testBodyProperty", JsonString.of("ghi890"))
+        additionalBodyProperties.put("testBodyProperty", JsonValue.from("ghi890"))
 
         val params =
             ChatCompletionCreateParams.builder()
diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/BatchServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/BatchServiceTest.kt
index 4c74fd2ba..b331fa78d 100644
--- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/BatchServiceTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/BatchServiceTest.kt
@@ -5,8 +5,10 @@ package com.openai.services.blocking
 import com.openai.TestServerExtension
 import com.openai.client.okhttp.OpenAIOkHttpClient
 import com.openai.core.JsonValue
-import com.openai.models.*
+import com.openai.models.BatchCancelParams
+import com.openai.models.BatchCreateParams
 import com.openai.models.BatchListParams
+import com.openai.models.BatchRetrieveParams
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/CompletionServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/CompletionServiceTest.kt
index ed85d0051..8c72c8b4b 100644
--- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/CompletionServiceTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/CompletionServiceTest.kt
@@ -5,7 +5,8 @@ package com.openai.services.blocking
 import com.openai.TestServerExtension
 import com.openai.client.okhttp.OpenAIOkHttpClient
 import com.openai.core.JsonValue
-import com.openai.models.*
+import com.openai.models.ChatCompletionStreamOptions
+import com.openai.models.CompletionCreateParams
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/EmbeddingServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/EmbeddingServiceTest.kt
index 29636b678..e5de38464 100644
--- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/EmbeddingServiceTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/EmbeddingServiceTest.kt
@@ -4,7 +4,8 @@ package com.openai.services.blocking
 
 import com.openai.TestServerExtension
 import com.openai.client.okhttp.OpenAIOkHttpClient
-import com.openai.models.*
+import com.openai.models.EmbeddingCreateParams
+import com.openai.models.EmbeddingModel
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/FileServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/FileServiceTest.kt
index f227c4596..2b108d90d 100644
--- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/FileServiceTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/FileServiceTest.kt
@@ -4,8 +4,9 @@ package com.openai.services.blocking
 
 import com.openai.TestServerExtension
 import com.openai.client.okhttp.OpenAIOkHttpClient
-import com.openai.models.*
+import com.openai.models.FileDeleteParams
 import com.openai.models.FileListParams
+import com.openai.models.FileRetrieveParams
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/ImageServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/ImageServiceTest.kt
index 575ec1644..c1ec94e85 100644
--- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/ImageServiceTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/ImageServiceTest.kt
@@ -4,7 +4,8 @@ package com.openai.services.blocking
 
 import com.openai.TestServerExtension
 import com.openai.client.okhttp.OpenAIOkHttpClient
-import com.openai.models.*
+import com.openai.models.ImageGenerateParams
+import com.openai.models.ImageModel
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModelServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModelServiceTest.kt
index 93f6830af..3f688337b 100644
--- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModelServiceTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModelServiceTest.kt
@@ -4,8 +4,9 @@ package com.openai.services.blocking
 
 import com.openai.TestServerExtension
 import com.openai.client.okhttp.OpenAIOkHttpClient
-import com.openai.models.*
+import com.openai.models.ModelDeleteParams
 import com.openai.models.ModelListParams
+import com.openai.models.ModelRetrieveParams
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModerationServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModerationServiceTest.kt
index 473e513f8..1b36d8916 100644
--- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModerationServiceTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModerationServiceTest.kt
@@ -4,7 +4,8 @@ package com.openai.services.blocking
 
 import com.openai.TestServerExtension
 import com.openai.client.okhttp.OpenAIOkHttpClient
-import com.openai.models.*
+import com.openai.models.ModerationCreateParams
+import com.openai.models.ModerationModel
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/UploadServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/UploadServiceTest.kt
index a1c572445..0980ec8d5 100644
--- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/UploadServiceTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/UploadServiceTest.kt
@@ -4,7 +4,10 @@ package com.openai.services.blocking
 
 import com.openai.TestServerExtension
 import com.openai.client.okhttp.OpenAIOkHttpClient
-import com.openai.models.*
+import com.openai.models.FilePurpose
+import com.openai.models.UploadCancelParams
+import com.openai.models.UploadCompleteParams
+import com.openai.models.UploadCreateParams
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/chat/CompletionServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/chat/CompletionServiceTest.kt
index b044e459b..49930a86b 100644
--- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/chat/CompletionServiceTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/chat/CompletionServiceTest.kt
@@ -5,7 +5,19 @@ package com.openai.services.blocking.chat
 import com.openai.TestServerExtension
 import com.openai.client.okhttp.OpenAIOkHttpClient
 import com.openai.core.JsonValue
-import com.openai.models.*
+import com.openai.models.ChatCompletionAudioParam
+import com.openai.models.ChatCompletionCreateParams
+import com.openai.models.ChatCompletionMessageParam
+import com.openai.models.ChatCompletionModality
+import com.openai.models.ChatCompletionPredictionContent
+import com.openai.models.ChatCompletionStreamOptions
+import com.openai.models.ChatCompletionSystemMessageParam
+import com.openai.models.ChatCompletionTool
+import com.openai.models.ChatCompletionToolChoiceOption
+import com.openai.models.ChatModel
+import com.openai.models.FunctionDefinition
+import com.openai.models.FunctionParameters
+import com.openai.models.ResponseFormatText
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/fineTuning/JobServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/fineTuning/JobServiceTest.kt
index ceffa47fa..c1f27cf9c 100644
--- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/fineTuning/JobServiceTest.kt
+++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/fineTuning/JobServiceTest.kt
@@ -4,9 +4,11 @@ package com.openai.services.blocking.fineTuning
 
 import com.openai.TestServerExtension
 import com.openai.client.okhttp.OpenAIOkHttpClient
-import com.openai.models.*
+import com.openai.models.FineTuningJobCancelParams
+import com.openai.models.FineTuningJobCreateParams
 import com.openai.models.FineTuningJobListEventsParams
 import com.openai.models.FineTuningJobListParams
+import com.openai.models.FineTuningJobRetrieveParams
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith