diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 127ac87b..6a37fe2d 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "4.0.0"
+  ".": "4.0.1"
 }
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a564be15..eb3e14e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 4.0.1 (2025-02-11)
+
+Full Changelog: [v4.0.0...v4.0.1](https://github.com/Finch-API/finch-api-java/compare/v4.0.0...v4.0.1)
+
+### Chores
+
+* **internal:** codegen related update ([#431](https://github.com/Finch-API/finch-api-java/issues/431)) ([8636c1c](https://github.com/Finch-API/finch-api-java/commit/8636c1c3dfc3e454e0d314283ffd060eb9f1a621))
+
 ## 4.0.0 (2025-02-05)
 
 Full Changelog: [v3.3.0...v4.0.0](https://github.com/Finch-API/finch-api-java/compare/v3.3.0...v4.0.0)
diff --git a/README.md b/README.md
index 47531877..9baf7ea6 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 <!-- x-release-please-start-version -->
 
-[![Maven Central](https://img.shields.io/maven-central/v/com.tryfinch.api/finch-java)](https://central.sonatype.com/artifact/com.tryfinch.api/finch-java/4.0.0)
+[![Maven Central](https://img.shields.io/maven-central/v/com.tryfinch.api/finch-java)](https://central.sonatype.com/artifact/com.tryfinch.api/finch-java/4.0.1)
 
 <!-- x-release-please-end -->
 
@@ -23,7 +23,7 @@ The REST API documentation can be found [in the Finch Documentation Center](htt
 ### Gradle
 
 ```kotlin
-implementation("com.tryfinch.api:finch-java:4.0.0")
+implementation("com.tryfinch.api:finch-java:4.0.1")
 ```
 
 ### Maven
@@ -32,7 +32,7 @@ implementation("com.tryfinch.api:finch-java:4.0.0")
 <dependency>
     <groupId>com.tryfinch.api</groupId>
     <artifactId>finch-java</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
 </dependency>
 ```
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 4f584e64..602a6b8d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,4 @@
 allprojects {
     group = "com.tryfinch.api"
-    version = "4.0.0" // x-release-please-version
+    version = "4.0.1" // x-release-please-version
 }
diff --git a/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListIndividualsPage.kt b/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListIndividualsPage.kt
index 41116b2f..5c83291a 100644
--- a/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListIndividualsPage.kt
+++ b/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListIndividualsPage.kt
@@ -32,7 +32,7 @@ private constructor(
 
     fun individuals(): List<IndividualInDirectory> = response().individuals()
 
-    fun paging(): Paging = response().paging()
+    fun paging(): Optional<Paging> = response().paging()
 
     override fun equals(other: Any?): Boolean {
         if (this === other) {
@@ -52,8 +52,8 @@ private constructor(
             return false
         }
 
-        return paging().offset().orElse(0) + individuals().count() <
-            paging().count().orElse(Long.MAX_VALUE)
+        return paging().flatMap { it.offset() }.orElse(0) + individuals().count() <
+            paging().flatMap { it.count() }.orElse(Long.MAX_VALUE)
     }
 
     fun getNextPageParams(): Optional<HrisDirectoryListIndividualsParams> {
@@ -64,7 +64,7 @@ private constructor(
         return Optional.of(
             HrisDirectoryListIndividualsParams.builder()
                 .from(params)
-                .offset(paging().offset().orElse(0) + individuals().count())
+                .offset(paging().flatMap { it.offset() }.orElse(0) + individuals().count())
                 .build()
         )
     }
@@ -104,7 +104,7 @@ private constructor(
         fun individuals(): List<IndividualInDirectory> =
             individuals.getNullable("individuals") ?: listOf()
 
-        fun paging(): Paging = paging.getRequired("paging")
+        fun paging(): Optional<Paging> = Optional.ofNullable(paging.getNullable("paging"))
 
         @JsonProperty("individuals")
         fun _individuals(): Optional<JsonField<List<IndividualInDirectory>>> =
@@ -125,7 +125,7 @@ private constructor(
             }
 
             individuals().map { it.validate() }
-            paging().validate()
+            paging().ifPresent { it.validate() }
             validated = true
         }
 
diff --git a/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListIndividualsPageAsync.kt b/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListIndividualsPageAsync.kt
index 0f336524..e516e91e 100644
--- a/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListIndividualsPageAsync.kt
+++ b/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListIndividualsPageAsync.kt
@@ -33,7 +33,7 @@ private constructor(
 
     fun individuals(): List<IndividualInDirectory> = response().individuals()
 
-    fun paging(): Paging = response().paging()
+    fun paging(): Optional<Paging> = response().paging()
 
     override fun equals(other: Any?): Boolean {
         if (this === other) {
@@ -53,8 +53,8 @@ private constructor(
             return false
         }
 
-        return paging().offset().orElse(0) + individuals().count() <
-            paging().count().orElse(Long.MAX_VALUE)
+        return paging().flatMap { it.offset() }.orElse(0) + individuals().count() <
+            paging().flatMap { it.count() }.orElse(Long.MAX_VALUE)
     }
 
     fun getNextPageParams(): Optional<HrisDirectoryListIndividualsParams> {
@@ -65,7 +65,7 @@ private constructor(
         return Optional.of(
             HrisDirectoryListIndividualsParams.builder()
                 .from(params)
-                .offset(paging().offset().orElse(0) + individuals().count())
+                .offset(paging().flatMap { it.offset() }.orElse(0) + individuals().count())
                 .build()
         )
     }
@@ -107,7 +107,7 @@ private constructor(
         fun individuals(): List<IndividualInDirectory> =
             individuals.getNullable("individuals") ?: listOf()
 
-        fun paging(): Paging = paging.getRequired("paging")
+        fun paging(): Optional<Paging> = Optional.ofNullable(paging.getNullable("paging"))
 
         @JsonProperty("individuals")
         fun _individuals(): Optional<JsonField<List<IndividualInDirectory>>> =
@@ -128,7 +128,7 @@ private constructor(
             }
 
             individuals().map { it.validate() }
-            paging().validate()
+            paging().ifPresent { it.validate() }
             validated = true
         }
 
diff --git a/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListPage.kt b/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListPage.kt
index 68aa5fb1..1eb5dec5 100644
--- a/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListPage.kt
+++ b/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListPage.kt
@@ -31,7 +31,7 @@ private constructor(
 
     fun individuals(): List<IndividualInDirectory> = response().individuals()
 
-    fun paging(): Paging = response().paging()
+    fun paging(): Optional<Paging> = response().paging()
 
     override fun equals(other: Any?): Boolean {
         if (this === other) {
@@ -51,8 +51,8 @@ private constructor(
             return false
         }
 
-        return paging().offset().orElse(0) + individuals().count() <
-            paging().count().orElse(Long.MAX_VALUE)
+        return paging().flatMap { it.offset() }.orElse(0) + individuals().count() <
+            paging().flatMap { it.count() }.orElse(Long.MAX_VALUE)
     }
 
     fun getNextPageParams(): Optional<HrisDirectoryListParams> {
@@ -63,7 +63,7 @@ private constructor(
         return Optional.of(
             HrisDirectoryListParams.builder()
                 .from(params)
-                .offset(paging().offset().orElse(0) + individuals().count())
+                .offset(paging().flatMap { it.offset() }.orElse(0) + individuals().count())
                 .build()
         )
     }
@@ -103,7 +103,7 @@ private constructor(
         fun individuals(): List<IndividualInDirectory> =
             individuals.getNullable("individuals") ?: listOf()
 
-        fun paging(): Paging = paging.getRequired("paging")
+        fun paging(): Optional<Paging> = Optional.ofNullable(paging.getNullable("paging"))
 
         @JsonProperty("individuals")
         fun _individuals(): Optional<JsonField<List<IndividualInDirectory>>> =
@@ -124,7 +124,7 @@ private constructor(
             }
 
             individuals().map { it.validate() }
-            paging().validate()
+            paging().ifPresent { it.validate() }
             validated = true
         }
 
diff --git a/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListPageAsync.kt b/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListPageAsync.kt
index e7587ae6..a46ebda5 100644
--- a/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListPageAsync.kt
+++ b/finch-java-core/src/main/kotlin/com/tryfinch/api/models/HrisDirectoryListPageAsync.kt
@@ -32,7 +32,7 @@ private constructor(
 
     fun individuals(): List<IndividualInDirectory> = response().individuals()
 
-    fun paging(): Paging = response().paging()
+    fun paging(): Optional<Paging> = response().paging()
 
     override fun equals(other: Any?): Boolean {
         if (this === other) {
@@ -52,8 +52,8 @@ private constructor(
             return false
         }
 
-        return paging().offset().orElse(0) + individuals().count() <
-            paging().count().orElse(Long.MAX_VALUE)
+        return paging().flatMap { it.offset() }.orElse(0) + individuals().count() <
+            paging().flatMap { it.count() }.orElse(Long.MAX_VALUE)
     }
 
     fun getNextPageParams(): Optional<HrisDirectoryListParams> {
@@ -64,7 +64,7 @@ private constructor(
         return Optional.of(
             HrisDirectoryListParams.builder()
                 .from(params)
-                .offset(paging().offset().orElse(0) + individuals().count())
+                .offset(paging().flatMap { it.offset() }.orElse(0) + individuals().count())
                 .build()
         )
     }
@@ -106,7 +106,7 @@ private constructor(
         fun individuals(): List<IndividualInDirectory> =
             individuals.getNullable("individuals") ?: listOf()
 
-        fun paging(): Paging = paging.getRequired("paging")
+        fun paging(): Optional<Paging> = Optional.ofNullable(paging.getNullable("paging"))
 
         @JsonProperty("individuals")
         fun _individuals(): Optional<JsonField<List<IndividualInDirectory>>> =
@@ -127,7 +127,7 @@ private constructor(
             }
 
             individuals().map { it.validate() }
-            paging().validate()
+            paging().ifPresent { it.validate() }
             validated = true
         }
 
diff --git a/finch-java-core/src/main/kotlin/com/tryfinch/api/models/JobAutomatedListPage.kt b/finch-java-core/src/main/kotlin/com/tryfinch/api/models/JobAutomatedListPage.kt
index 8747fddf..23663d9a 100644
--- a/finch-java-core/src/main/kotlin/com/tryfinch/api/models/JobAutomatedListPage.kt
+++ b/finch-java-core/src/main/kotlin/com/tryfinch/api/models/JobAutomatedListPage.kt
@@ -35,7 +35,7 @@ private constructor(
 
     fun data(): List<AutomatedAsyncJob> = response().data()
 
-    fun paging(): Paging = response().paging()
+    fun paging(): Optional<Paging> = response().paging()
 
     override fun equals(other: Any?): Boolean {
         if (this === other) {
@@ -55,8 +55,8 @@ private constructor(
             return false
         }
 
-        return paging().offset().orElse(0) + data().count() <
-            paging().count().orElse(Long.MAX_VALUE)
+        return paging().flatMap { it.offset() }.orElse(0) + data().count() <
+            paging().flatMap { it.count() }.orElse(Long.MAX_VALUE)
     }
 
     fun getNextPageParams(): Optional<JobAutomatedListParams> {
@@ -67,7 +67,7 @@ private constructor(
         return Optional.of(
             JobAutomatedListParams.builder()
                 .from(params)
-                .offset(paging().offset().orElse(0) + data().count())
+                .offset(paging().flatMap { it.offset() }.orElse(0) + data().count())
                 .build()
         )
     }
@@ -106,7 +106,7 @@ private constructor(
 
         fun data(): List<AutomatedAsyncJob> = data.getNullable("data") ?: listOf()
 
-        fun paging(): Paging = paging.getRequired("paging")
+        fun paging(): Optional<Paging> = Optional.ofNullable(paging.getNullable("paging"))
 
         @JsonProperty("data")
         fun _data(): Optional<JsonField<List<AutomatedAsyncJob>>> = Optional.ofNullable(data)
@@ -126,7 +126,7 @@ private constructor(
             }
 
             data().map { it.validate() }
-            paging().validate()
+            paging().ifPresent { it.validate() }
             validated = true
         }
 
diff --git a/finch-java-core/src/main/kotlin/com/tryfinch/api/models/JobAutomatedListPageAsync.kt b/finch-java-core/src/main/kotlin/com/tryfinch/api/models/JobAutomatedListPageAsync.kt
index d93302c0..a89d64a1 100644
--- a/finch-java-core/src/main/kotlin/com/tryfinch/api/models/JobAutomatedListPageAsync.kt
+++ b/finch-java-core/src/main/kotlin/com/tryfinch/api/models/JobAutomatedListPageAsync.kt
@@ -36,7 +36,7 @@ private constructor(
 
     fun data(): List<AutomatedAsyncJob> = response().data()
 
-    fun paging(): Paging = response().paging()
+    fun paging(): Optional<Paging> = response().paging()
 
     override fun equals(other: Any?): Boolean {
         if (this === other) {
@@ -56,8 +56,8 @@ private constructor(
             return false
         }
 
-        return paging().offset().orElse(0) + data().count() <
-            paging().count().orElse(Long.MAX_VALUE)
+        return paging().flatMap { it.offset() }.orElse(0) + data().count() <
+            paging().flatMap { it.count() }.orElse(Long.MAX_VALUE)
     }
 
     fun getNextPageParams(): Optional<JobAutomatedListParams> {
@@ -68,7 +68,7 @@ private constructor(
         return Optional.of(
             JobAutomatedListParams.builder()
                 .from(params)
-                .offset(paging().offset().orElse(0) + data().count())
+                .offset(paging().flatMap { it.offset() }.orElse(0) + data().count())
                 .build()
         )
     }
@@ -109,7 +109,7 @@ private constructor(
 
         fun data(): List<AutomatedAsyncJob> = data.getNullable("data") ?: listOf()
 
-        fun paging(): Paging = paging.getRequired("paging")
+        fun paging(): Optional<Paging> = Optional.ofNullable(paging.getNullable("paging"))
 
         @JsonProperty("data")
         fun _data(): Optional<JsonField<List<AutomatedAsyncJob>>> = Optional.ofNullable(data)
@@ -129,7 +129,7 @@ private constructor(
             }
 
             data().map { it.validate() }
-            paging().validate()
+            paging().ifPresent { it.validate() }
             validated = true
         }